diff -Nru kactivities-kf5-5.61.0/autotests/common/test.cpp kactivities-kf5-5.62.0/autotests/common/test.cpp --- kactivities-kf5-5.61.0/autotests/common/test.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/autotests/common/test.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -37,7 +37,7 @@ for (const QString & service : services) { bool kdeServiceAndNotKAMD = - service.startsWith(QStringLiteral("org.kde")) && + service.startsWith(QLatin1String("org.kde")) && service != KAMD_DBUS_SERVICE; if (kdeServiceAndNotKAMD) { diff -Nru kactivities-kf5-5.61.0/autotests/common/test.h kactivities-kf5-5.62.0/autotests/common/test.h --- kactivities-kf5-5.61.0/autotests/common/test.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/autotests/common/test.h 2019-09-07 12:32:21.000000000 +0000 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff -Nru kactivities-kf5-5.61.0/autotests/core/CleanOnlineTest.cpp kactivities-kf5-5.62.0/autotests/core/CleanOnlineTest.cpp --- kactivities-kf5-5.61.0/autotests/core/CleanOnlineTest.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/autotests/core/CleanOnlineTest.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -89,7 +89,7 @@ TEST_WAIT_UNTIL(f3.isFinished()); KActivities::Info ac(id1); - TEST_WAIT_UNTIL(ac.name() == QStringLiteral("Renamed activity")); + TEST_WAIT_UNTIL(ac.name() == QLatin1String("Renamed activity")); TEST_WAIT_UNTIL(activities->activities().size() == 2); } @@ -103,8 +103,8 @@ KActivities::Info i1(CleanOnlineSetup::id1); KActivities::Info i2(CleanOnlineSetup::id2); - TEST_WAIT_UNTIL(i1.name() == QStringLiteral("Renamed activity")); - TEST_WAIT_UNTIL(i2.name() == QStringLiteral("The second one")); + TEST_WAIT_UNTIL(i1.name() == QLatin1String("Renamed activity")); + TEST_WAIT_UNTIL(i2.name() == QLatin1String("The second one")); qDebug() << CleanOnlineSetup::id1 << i1.name(); qDebug() << CleanOnlineSetup::id2 << i2.name(); diff -Nru kactivities-kf5-5.61.0/autotests/core/main.cpp kactivities-kf5-5.62.0/autotests/core/main.cpp --- kactivities-kf5-5.61.0/autotests/core/main.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/autotests/core/main.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include #include #include diff -Nru kactivities-kf5-5.61.0/autotests/core/OfflineTest.cpp kactivities-kf5-5.62.0/autotests/core/OfflineTest.cpp --- kactivities-kf5-5.61.0/autotests/core/OfflineTest.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/autotests/core/OfflineTest.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include -#include #include QString nulluuid = QStringLiteral("00000000-0000-0000-0000-000000000000"); diff -Nru kactivities-kf5-5.61.0/CMakeLists.txt kactivities-kf5-5.62.0/CMakeLists.txt --- kactivities-kf5-5.61.0/CMakeLists.txt 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/CMakeLists.txt 2019-09-07 12:32:21.000000000 +0000 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5) # KDE Frameworks -set(KF5_VERSION "5.61.0") # handled by release scripts -set(KF5_DEP_VERSION "5.61.0") # handled by release scripts +set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_DEP_VERSION "5.62.0") # handled by release scripts project (KActivities VERSION ${KF5_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.61.0 NO_MODULE) +find_package(ECM 5.62.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kactivities-kf5-5.61.0/debian/changelog kactivities-kf5-5.62.0/debian/changelog --- kactivities-kf5-5.61.0/debian/changelog 2019-08-12 09:40:33.000000000 +0000 +++ kactivities-kf5-5.62.0/debian/changelog 2019-09-14 07:05:00.000000000 +0000 @@ -1,3 +1,9 @@ +kactivities-kf5 (5.62.0-0ubuntu1) eoan; urgency=medium + + * New upstream release (5.62.0) + + -- Rik Mills Sat, 14 Sep 2019 08:05:00 +0100 + kactivities-kf5 (5.61.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.61.0) diff -Nru kactivities-kf5-5.61.0/debian/control kactivities-kf5-5.62.0/debian/control --- kactivities-kf5-5.61.0/debian/control 2019-08-12 09:40:33.000000000 +0000 +++ kactivities-kf5-5.62.0/debian/control 2019-09-14 07:05:00.000000000 +0000 @@ -6,21 +6,21 @@ Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.61.0~), + extra-cmake-modules (>= 5.62.0~), graphviz, libboost-dev (>= 1.49~), - libkf5config-dev (>= 5.61.0~), - libkf5coreaddons-dev (>= 5.61.0~), - libkf5dbusaddons-dev (>= 5.61.0~), - libkf5declarative-dev (>= 5.61.0~), - libkf5globalaccel-dev (>= 5.61.0~), - libkf5i18n-dev (>= 5.61.0~), - libkf5kcmutils-dev (>= 5.61.0~), - libkf5kio-dev (>= 5.61.0~), - libkf5service-dev (>= 5.61.0~), - libkf5widgetsaddons-dev (>= 5.61.0~), - libkf5windowsystem-dev (>= 5.61.0~), - libkf5xmlgui-dev (>= 5.61.0~), + libkf5config-dev (>= 5.62.0~), + libkf5coreaddons-dev (>= 5.62.0~), + libkf5dbusaddons-dev (>= 5.62.0~), + libkf5declarative-dev (>= 5.62.0~), + libkf5globalaccel-dev (>= 5.62.0~), + libkf5i18n-dev (>= 5.62.0~), + libkf5kcmutils-dev (>= 5.62.0~), + libkf5kio-dev (>= 5.62.0~), + libkf5service-dev (>= 5.62.0~), + libkf5widgetsaddons-dev (>= 5.62.0~), + libkf5windowsystem-dev (>= 5.62.0~), + libkf5xmlgui-dev (>= 5.62.0~), libqt5sql5-sqlite, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.8.0~), diff -Nru kactivities-kf5-5.61.0/src/cli/main.cpp kactivities-kf5-5.62.0/src/cli/main.cpp --- kactivities-kf5-5.61.0/src/cli/main.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/cli/main.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -237,7 +237,7 @@ } #define MATCH_COMMAND(Command) \ - else if (args[argId] == QStringLiteral("--") + toDashes(QStringLiteral(#Command))) \ + else if (args[argId] == QLatin1String("--") + toDashes(QStringLiteral(#Command))) \ { \ argId += 1 + Command##_command({ args, argId })(); \ } diff -Nru kactivities-kf5-5.61.0/src/imports/activitiesextensionplugin.cpp kactivities-kf5-5.62.0/src/imports/activitiesextensionplugin.cpp --- kactivities-kf5-5.61.0/src/imports/activitiesextensionplugin.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/imports/activitiesextensionplugin.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -19,7 +19,6 @@ #include "activitiesextensionplugin.h" -#include #include "activitymodel.h" #include "activityinfo.h" @@ -33,7 +32,6 @@ // replace ActivityModel with the KActivities::ActivitiesModel // (but keep the name) -#include ActivitiesExtensionPlugin::ActivitiesExtensionPlugin(QObject *parent) : QQmlExtensionPlugin(parent) diff -Nru kactivities-kf5-5.61.0/src/imports/activityinfo.cpp kactivities-kf5-5.62.0/src/imports/activityinfo.cpp --- kactivities-kf5-5.61.0/src/imports/activityinfo.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/imports/activityinfo.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -48,7 +48,7 @@ void ActivityInfo::setActivityId(const QString &id) { - m_showCurrentActivity = (id == QStringLiteral(":current")); + m_showCurrentActivity = (id == QLatin1String(":current")); setIdInternal(m_showCurrentActivity ? m_service.currentActivity() : id); diff -Nru kactivities-kf5-5.61.0/src/imports/activitymodel.cpp kactivities-kf5-5.62.0/src/imports/activitymodel.cpp --- kactivities-kf5-5.61.0/src/imports/activitymodel.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/imports/activitymodel.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -507,16 +507,16 @@ m_shownStatesString = states; for (const auto &state: states.split(QLatin1Char(','))) { - if (state == QStringLiteral("Running")) { + if (state == QLatin1String("Running")) { m_shownStates.insert(Running); - } else if (state == QStringLiteral("Starting")) { + } else if (state == QLatin1String("Starting")) { m_shownStates.insert(Starting); - } else if (state == QStringLiteral("Stopped")) { + } else if (state == QLatin1String("Stopped")) { m_shownStates.insert(Stopped); - } else if (state == QStringLiteral("Stopping")) { + } else if (state == QLatin1String("Stopping")) { m_shownStates.insert(Stopping); } @@ -562,7 +562,7 @@ const QString &icon = item->icon(); // We need a default icon for activities - return icon.isEmpty() ? QStringLiteral("preferences-activities") : icon; + return icon.isEmpty() ? QStringLiteral("activities") : icon; } case ActivityDescription: diff -Nru kactivities-kf5-5.61.0/src/imports/resourcemodel.cpp kactivities-kf5-5.62.0/src/imports/resourcemodel.cpp --- kactivities-kf5-5.61.0/src/imports/resourcemodel.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/imports/resourcemodel.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -23,11 +23,9 @@ // Qt #include #include -#include #include #include #include -#include #include // KDE @@ -336,7 +334,7 @@ // for application:/ and a few more if (uri.startsWith('/')) { - uri = QStringLiteral("file://") + uri; + uri = QLatin1String("file://") + uri; } KFileItem file(uri); @@ -687,7 +685,7 @@ QString ResourceModel::validateResource(const QString &resource) const { - return resource.startsWith(QStringLiteral("file://")) ? + return resource.startsWith(QLatin1String("file://")) ? QUrl(resource).toLocalFile() : resource; } diff -Nru kactivities-kf5-5.61.0/src/lib/activitiesmodel.cpp kactivities-kf5-5.62.0/src/lib/activitiesmodel.cpp --- kactivities-kf5-5.61.0/src/lib/activitiesmodel.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/activitiesmodel.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -399,7 +398,7 @@ const QString &icon = item->icon(); // We need a default icon for activities - return icon.isEmpty() ? QStringLiteral("preferences-activities") : icon; + return icon.isEmpty() ? QStringLiteral("activities") : icon; } case ActivityDescription: diff -Nru kactivities-kf5-5.61.0/src/lib/consumer_p.h kactivities-kf5-5.62.0/src/lib/consumer_p.h --- kactivities-kf5-5.61.0/src/lib/consumer_p.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/consumer_p.h 2019-09-07 12:32:21.000000000 +0000 @@ -26,7 +26,6 @@ #include -#include #include "activitiescache_p.h" diff -Nru kactivities-kf5-5.61.0/src/lib/controller.h kactivities-kf5-5.62.0/src/lib/controller.h --- kactivities-kf5-5.61.0/src/lib/controller.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/controller.h 2019-09-07 12:32:21.000000000 +0000 @@ -24,7 +24,6 @@ #include #include -#include #include #include "consumer.h" diff -Nru kactivities-kf5-5.61.0/src/lib/info.h kactivities-kf5-5.62.0/src/lib/info.h --- kactivities-kf5-5.61.0/src/lib/info.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/info.h 2019-09-07 12:32:21.000000000 +0000 @@ -24,7 +24,6 @@ #include #include -#include #include #include "kactivities_export.h" diff -Nru kactivities-kf5-5.61.0/src/lib/info_p.h kactivities-kf5-5.62.0/src/lib/info_p.h --- kactivities-kf5-5.61.0/src/lib/info_p.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/info_p.h 2019-09-07 12:32:21.000000000 +0000 @@ -23,7 +23,6 @@ #define KACTIVITIESINFO_P_H #include "info.h" -#include #include #include "activitiescache_p.h" diff -Nru kactivities-kf5-5.61.0/src/lib/mainthreadexecutor_p.cpp kactivities-kf5-5.62.0/src/lib/mainthreadexecutor_p.cpp --- kactivities-kf5-5.61.0/src/lib/mainthreadexecutor_p.cpp 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/lib/mainthreadexecutor_p.cpp 2019-09-07 12:32:21.000000000 +0000 @@ -24,7 +24,6 @@ #include #include -#include #include #include diff -Nru kactivities-kf5-5.61.0/src/utils/qflatset.h kactivities-kf5-5.62.0/src/utils/qflatset.h --- kactivities-kf5-5.61.0/src/utils/qflatset.h 2019-08-03 19:30:40.000000000 +0000 +++ kactivities-kf5-5.62.0/src/utils/qflatset.h 2019-09-07 12:32:21.000000000 +0000 @@ -24,7 +24,6 @@ #include #include -#include namespace KActivities {