Bump KF and/or QT versions in ecm_set_disabled_deprecation_versions

KDE · Nov 20, 2024 · 46e7027 · 46e7027
1 parent 1bef7cc
commit 46e7027
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,7 +62,7 @@ ecm_find_qmlmodule(Qt.labs.platform 1.1)
 add_definitions(-DTRANSLATION_DOMAIN=\"filelight\")
 
 ecm_set_disabled_deprecation_versions(QT 6.8.0
-    KF 6.7
+    KF 6.8.0
 )
 add_definitions(-DQT_NO_CONTEXTLESS_CONNECT)
 include_directories(src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -95,6 +95,11 @@ target_link_libraries(filelight
     Qt6::QuickControls2
     filelightInternal
 )
+if(TARGET KF6::I18nQml)
+target_link_libraries(filelight
+        KF6::I18nQml
+)
+endif()
 
 if(APPLE)
     set_target_properties(filelight PROPERTIES

diff --git a/src/mainContext.cpp b/src/mainContext.cpp
@@ -7,7 +7,10 @@
  ***********************************************************************/
 
 #include "mainContext.h"
-
+#include "ki18n_version.h"
+#if KI18N_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+#include <KLocalizedQmlContext>
+#endif
 #include <KAboutData>
 #include <KIO/Global> // upUrl
 #include <KLocalizedString>
@@ -54,7 +57,11 @@ MainContext::MainContext(QObject *parent)
 
     auto engine = new QQmlApplicationEngine(this);
 
+#if KI18N_VERSION < QT_VERSION_CHECK(6, 8, 0)
     static auto l10nContext = new KLocalizedContext(engine);
+#else
+    static auto l10nContext = new KLocalizedQmlContext(engine);
+#endif
     l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN));
     engine->rootContext()->setContextObject(l10nContext);