Merge branch 'master' into rempt/T379-resource-management

Author: hallarempt

CMakeLists.txt

@@ -357,14 +357,6 @@ if (NOT WIN32 AND NOT APPLE)
         TYPE OPTIONAL
         PURPOSE "Optionally used to provide a dbus api on Linux")
 
-    find_package(KF5KIO ${MIN_FRAMEWORKS_VERSION})
-    macro_bool_to_01(KF5KIO_FOUND HAVE_KIO)
-    set_package_properties(KF5KIO PROPERTIES
-        DESCRIPTION "KDE's KIO Framework"
-        URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/kio/html/index.html"
-        TYPE OPTIONAL
-        PURPOSE "Optionally used for recent document handling")
-
     find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION})
     macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH)
     set_package_properties(KF5Crash PROPERTIES

KoConfig.h.cmake

@@ -49,9 +49,6 @@
 /* Defines if we use lcms2.4 */
 #cmakedefine HAVE_LCMS24 1
 
-/* Defines if KIO is present */
-#cmakedefine HAVE_KIO 1
-
 /* Defines if DBUS is present */
 #cmakedefine HAVE_DBUS 1