diff --git a/CMakeLists.txt b/CMakeLists.txt index 10fe66daa..3c4689ff5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_ project(NeoChat VERSION ${RELEASE_SERVICE_VERSION}) set(KF_MIN_VERSION "6.17") -set(QT_MIN_VERSION "6.5") +set(QT_MIN_VERSION "6.8") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) diff --git a/patches/0001-Revert-Bump-KF6-dependency-version.patch b/patches/0001-Revert-Bump-KF6-dependency-version.patch index 08243fd09..29d9dce67 100644 --- a/patches/0001-Revert-Bump-KF6-dependency-version.patch +++ b/patches/0001-Revert-Bump-KF6-dependency-version.patch @@ -20,7 +20,7 @@ index 10fe66daa..cd063113d 100644 -set(KF_MIN_VERSION "6.17") +set(KF_MIN_VERSION "6.12") - set(QT_MIN_VERSION "6.5") + set(QT_MIN_VERSION "6.8") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) -- diff --git a/src/app/controller.cpp b/src/app/controller.cpp index 3ff0e692e..d3e4b1a6a 100644 --- a/src/app/controller.cpp +++ b/src/app/controller.cpp @@ -38,14 +38,6 @@ #include "trayicon_sni.h" #endif -#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0) -#ifndef Q_OS_ANDROID -#include -#include -#include -#endif -#endif - #ifdef HAVE_KUNIFIEDPUSH #include #endif @@ -336,30 +328,7 @@ void Controller::clearInvitationNotification(const QString &roomId) void Controller::updateBadgeNotificationCount(int count) { -#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0) -#ifndef Q_OS_ANDROID - // copied from Telegram desktop - const auto launcherUrl = "application://org.kde.neochat.desktop"_L1; - // Gnome requires that count is a 64bit integer - const qint64 counterSlice = std::min(count, 9999); - QVariantMap dbusUnityProperties; - - if (counterSlice > 0) { - dbusUnityProperties["count"_L1] = counterSlice; - dbusUnityProperties["count-visible"_L1] = true; - } else { - dbusUnityProperties["count-visible"_L1] = false; - } - - auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_L1, "com.canonical.Unity.LauncherEntry"_L1, "Update"_L1); - - signal.setArguments({launcherUrl, dbusUnityProperties}); - - QDBusConnection::sessionBus().send(signal); -#endif // Q_OS_ANDROID -#else qGuiApp->setBadgeNumber(count); -#endif // QT_VERSION_CHECK(6, 6, 0) } bool Controller::isFlatpak() const