diff --git a/applets/kicker/plugin/runnermodel.cpp b/applets/kicker/plugin/runnermodel.cpp --- a/applets/kicker/plugin/runnermodel.cpp +++ b/applets/kicker/plugin/runnermodel.cpp @@ -167,8 +167,16 @@ void RunnerModel::setRunners(const QStringList &runners) { - if (m_runners.toSet() != runners.toSet()) { - m_runners = runners; + QStringList newRunners = runners; + newRunners.removeDuplicates(); + newRunners.sort(); + + QStringList currRunners = m_runners; + currRunners.removeDuplicates(); + currRunners.sort(); + + if (currRunners != newRunners) { + m_runners = newRunners; if (m_runnerManager) { m_runnerManager->setAllowedRunners(runners); diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/systemmonitor/systemmonitor.cpp --- a/dataengines/systemmonitor/systemmonitor.cpp +++ b/dataengines/systemmonitor/systemmonitor.cpp @@ -50,7 +50,11 @@ QStringList SystemMonitorEngine::sources() const { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) return m_sensors.toList(); +#else + return QList(m_sensors.begin(), m_sensors.end()); +#endif } bool SystemMonitorEngine::sourceRequestEvent(const QString &name) diff --git a/kcms/translations/translationsmodel.cpp b/kcms/translations/translationsmodel.cpp --- a/kcms/translations/translationsmodel.cpp +++ b/kcms/translations/translationsmodel.cpp @@ -274,7 +274,11 @@ { beginResetModel(); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) m_availableLanguages = (m_installedLanguages - QSet::fromList(languages)).values(); +#else + m_availableLanguages = (m_installedLanguages - QSet(languages.begin(), languages.end())).values(); +#endif QCollator c; c.setCaseSensitivity(Qt::CaseInsensitive); diff --git a/libtaskmanager/launchertasksmodel.cpp b/libtaskmanager/launchertasksmodel.cpp --- a/libtaskmanager/launchertasksmodel.cpp +++ b/libtaskmanager/launchertasksmodel.cpp @@ -148,7 +148,11 @@ return false; } - const auto activities = ActivitiesSet::fromList(_activities); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QSet activities = ActivitiesSet::fromList(_activities); +#else + const QSet activities = QSet(_activities.begin(), _activities.end()); +#endif if (url.isLocalFile() && KDesktopFile::isDesktopFile(url.toLocalFile())) { KDesktopFile f(url.toLocalFile()); @@ -404,7 +408,11 @@ std::tie(url, _activities) = deserializeLauncher(serializedLauncher); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) auto activities = ActivitiesSet::fromList(_activities); +#else + auto activities = ActivitiesSet(_activities.begin(), _activities.end()); +#endif // Is url is not valid, ignore it if (!isValidLauncherUrl(url)) { diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp --- a/libtaskmanager/taskgroupingproxymodel.cpp +++ b/libtaskmanager/taskgroupingproxymodel.cpp @@ -851,7 +851,11 @@ void TaskGroupingProxyModel::setBlacklistedAppIds(const QStringList &list) { - const QSet &set = QSet::fromList(list); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QSet set = QSet::fromList(list); +#else + const QSet set = QSet(list.begin(), list.end()); +#endif if (d->blacklistedAppIds != set) { d->blacklistedAppIds = set; @@ -882,7 +886,11 @@ void TaskGroupingProxyModel::setBlacklistedLauncherUrls(const QStringList &list) { - const QSet &set = QSet::fromList(list); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QSet set = QSet::fromList(list); +#else + const QSet set = QSet(list.begin(), list.end()); +#endif if (d->blacklistedLauncherUrls != set) { d->blacklistedLauncherUrls = set; diff --git a/wallpapers/image/backgroundlistmodel.cpp b/wallpapers/image/backgroundlistmodel.cpp --- a/wallpapers/image/backgroundlistmodel.cpp +++ b/wallpapers/image/backgroundlistmodel.cpp @@ -137,7 +137,12 @@ connect(finder, &BackgroundFinder::backgroundsFound, this, &BackgroundListModel::backgroundsFound); m_findToken = finder->token(); finder->start(); + +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) m_removableWallpapers = QSet::fromList(selected); +#else + m_removableWallpapers = QSet(selected.begin(), selected.end()); +#endif } void BackgroundListModel::backgroundsFound(const QStringList &paths, const QString &token)