Improve searching for KActivities

CMakeLists.txt

@@ -63,10 +63,15 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
     Wallet
     WindowSystem
 )
-if(NOT WIN32)
+if(NOT WIN32 AND NOT ANDROID)
     find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
         Activities
     )
+    set_package_properties("KF5Activities" PROPERTIES
+        DESCRIPTION  "Activities interface library"
+        URL "https://api.kde.org/frameworks/kactivities/html/"
+        TYPE RECOMMENDED
+        PURPOSE "Required for Activities integration.")
 endif()
 find_package(KF5Kirigami2)
 set_package_properties(KF5Kirigami2 PROPERTIES

shell/CMakeLists.txt

@@ -4,15 +4,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-
-if(NOT WIN32)
-set_package_properties("KActivities" PROPERTIES
-        DESCRIPTION  "Activities interface library"
-        URL "https://projects.kde.org/projects/kde/kdelibs/kactivities"
-        TYPE RECOMMENDED
-        PURPOSE "Required for Activities integration.")
-endif()
-
 # okular
 
 set(okular_SRCS
@@ -28,8 +19,9 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
 add_executable(okular ${okular_SRCS})
 
 target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash)
+if(TARGET KF5::Activities)
+    target_compile_definitions(okular PUBLIC -DWITH_KACTIVITIES=1)
 
-if(NOT WIN32)
 	target_link_libraries(okular KF5::Activities)
 endif()
 

shell/shell.cpp

@@ -49,7 +49,7 @@
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KIO/Global>
-#ifndef Q_OS_WIN
+#ifdef WITH_KACTIVITIES
 #include <KActivities/ResourceInstance>
 #endif
 
@@ -283,7 +283,7 @@ void Shell::openUrl( const QUrl & url, const QString &serializedOptions )
             {
                 if ( openOk )
                 {
-#ifndef Q_OS_WIN
+#ifdef WITH_KACTIVITIES
                     if ( !m_activityResource )
                         m_activityResource = new KActivities::ResourceInstance( window()->winId(), this );