diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,6 @@ find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED) # KdepimLibs package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) @@ -149,10 +148,10 @@ option(KDEPIM_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE) - #add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 ) - - +# QUrl +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) +remove_definitions(-DQT_NO_CAST_FROM_ASCII) add_subdirectory(resources) add_subdirectory(agents) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -43,6 +43,7 @@ add_subdirectory( ical ) add_subdirectory( imap ) if (Libkolabxml_FOUND) + find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED) add_subdirectory( kolab ) endif() add_subdirectory( facebook )