diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e618f475..c15a46fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ include(ECMCheckOutboundLicense) include(ECMQtDeclareLoggingCategory) include(ECMAddAndroidApk) include(ECMQmlModule) +include(ECMDeprecationSettings) include(GenerateExportHeader) include(ECMGenerateHeaders) if (NOT ANDROID) @@ -51,6 +52,8 @@ endif() set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE) +ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0) + ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX NEOCHAT VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 340ebeb44..a5d513d2c 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -204,6 +204,7 @@ target_link_libraries(neochat PUBLIC KF6::SonnetCore KF6::IconThemes KF6::ItemModels + KF6::I18nQml QuotientQt6 Login Rooms diff --git a/src/app/main.cpp b/src/app/main.cpp index d79cc0f02..6e4043296 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -38,7 +38,7 @@ #endif #include -#include +#include #include #include "neochat-version.h" @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) }); #endif - engine.rootContext()->setContextObject(new KLocalizedContext(&engine)); + KLocalization::setupLocalizedContext(&engine); engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory()); if (parser.isSet("ignore-ssl-errors"_L1)) {