Utilize ecm_set_deprecation_versions to exclude deprecated API

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f58fab1fa7aa16bfbf7cd8f6d87cec7c5a6273fe..ca845f3bee49496de21acb46ecfc241cc3601641 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ include(CMakePackageConfigHelpers)
 include(GenerateExportHeader)
 include(FeatureSummary)
 include(ECMQtDeclareLoggingCategory)
 include(GenerateExportHeader)
 include(FeatureSummary)
 include(ECMQtDeclareLoggingCategory)

+include(ECMDeprecationSettings)

 
 ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
 
 ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"


@@ -138,11 +139,10 @@ else()
     set(HAVE_TERMINAL TRUE)
 endif()
 
     set(HAVE_TERMINAL TRUE)
 endif()
 

-add_definitions(
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00
-    -DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-    -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800
-    -DKF_DEPRECATED_WARNINGS_SINCE=0x060000
+ecm_set_disabled_deprecation_versions(SHOW_DEPRECATIONS
+    QT 5.15
+    KF 5.90
+    KSERVICE 5.89 # We use KServiceTypeTrader in a compat code path

 )
 
 add_subdirectory(src)
 )
 
 add_subdirectory(src)

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 2f39cd1a21a0b9c402b1411b59d39626f4ae833e..d4d0be0e8b2332a124526941e1dc3df2d0111638 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -16,6 +16,7 @@
 #include <KDirLister>
 #include <KIO/Job>
 #include <KLocalizedString>
 #include <KDirLister>
 #include <KIO/Job>
 #include <KLocalizedString>

+#include <KLazyLocalizedString>

 #include <KUrlMimeData>
 
 #include <QElapsedTimer>
 #include <KUrlMimeData>
 
 #include <QElapsedTimer>