From 8bc7f72a731904f4cc0669333e5db39613246e9e Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sun, 19 Dec 2021 15:31:02 +0100 Subject: [PATCH] Utilize ecm_set_deprecation_versions to exclude deprecated API --- CMakeLists.txt | 10 +++++----- src/kitemviews/kfileitemmodel.cpp | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f58fab1fa7..ca845f3bee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ include(CMakePackageConfigHelpers) 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" @@ -138,11 +139,10 @@ else() 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) diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 2f39cd1a21..d4d0be0e8b 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include