diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/kitemviews/kfileitemlistview.cpp | 3 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 3 | ||||
| -rw-r--r-- | src/kitemviews/private/kfileitemclipboard.cpp | 3 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 2 | ||||
| -rw-r--r-- | src/views/dolphinviewactionhandler.cpp | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c1a08843..c1b1a7b84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set (RELEASE_SERVICE_VERSION_MICRO "70") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) -set(QT_MIN_VERSION "5.12.0") +set(QT_MIN_VERSION "5.14.0") set(KF5_MIN_VERSION "5.73.0") # ECM setup diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 73d6c72e9..4ccda7b51 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -388,7 +388,8 @@ void KFileItemListView::applyRolesToModel() // KFileItemModel does not distinct between "visible" and "invisible" roles. // Add all roles that are mandatory for having a working KFileItemListView: - QSet<QByteArray> roles = visibleRoles().toSet(); + const auto visibleRoles = this->visibleRoles(); + auto roles = QSet<QByteArray>(visibleRoles.constBegin(), visibleRoles.constEnd()); roles.insert("iconPixmap"); roles.insert("iconName"); roles.insert("text"); diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 3939fd237..daf765cc2 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -658,7 +658,8 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur QSet<QByteArray> dirtyRoles; if (roles.isEmpty()) { - dirtyRoles = visibleRoles().toSet(); + const auto visibleRoles = this->visibleRoles(); + dirtyRoles = QSet<QByteArray>(visibleRoles.constBegin(), visibleRoles.constEnd()); } else { dirtyRoles = roles; } diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index e1deda3dd..c12b4b7b1 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -54,7 +54,8 @@ void KFileItemClipboard::updateCutItems() const QByteArray data = mimeData->data(QStringLiteral("application/x-kde-cutselection")); const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1')); if (isCutSelection) { - m_cutItems = KUrlMimeData::urlsFromMimeData(mimeData).toSet(); + const auto urlsFromMimeData = KUrlMimeData::urlsFromMimeData(mimeData); + m_cutItems = QSet<QUrl>(urlsFromMimeData.constBegin(), urlsFromMimeData.constEnd()); } else { m_cutItems.clear(); } diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 167f88c39..664e4eba9 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -963,7 +963,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) QPointer<QMenu> menu = new QMenu(QApplication::activeWindow()); KItemListView* view = m_container->controller()->view(); - const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet(); + const QList<QByteArray> visibleRolesSet = view->visibleRoles(); bool indexingEnabled = false; #ifdef HAVE_BALOO diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index a63263bf5..eb22baa00 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -521,7 +521,7 @@ void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray>& { Q_UNUSED(previous) - const QSet<QByteArray> checkedRoles = current.toSet(); + const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd()); QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles); while (it.hasNext()) { it.next(); |