optional-qtwebengine

Gbp-Pq: Name optional-qtwebengine.diff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71c582b8f9341d0dfeab9709fcff63ae234479e8..5a6190e0dc8c05c5894b09834279adf7eea28781 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,8 @@ include(CMakePackageConfigHelpers)
 set(KONQUEROR_LIB_VERSION "5.0.97")
 set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets)
+find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS WebEngineWidgets)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash)
 
 find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional
@@ -55,7 +56,9 @@ add_subdirectory( client )
 if(BUILD_TESTING)
     add_subdirectory( autotests )
 endif()
-add_subdirectory( webenginepart )
+if (Qt5WebEngineWidgets_FOUND)
+    add_subdirectory( webenginepart )
+endif()
 
 add_subdirectory( about )
 add_subdirectory( pics )

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 09c1a28e94bfd073a2163827ae21dcbdad43207d..27939c03d1026a7d91e2c842330f3d79746d112e 100644 (file)
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -7,12 +7,14 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/..  )
 
 ########### konqviewmgrtest ###############
 
-add_executable(konqviewmgrtest konqviewmgrtest.cpp)
-add_test(konqviewmgrtest konqviewmgrtest)
-ecm_mark_as_test(konqviewmgrtest)
-target_link_libraries(konqviewmgrtest kdeinit_konqueror Qt5::Core Qt5::Gui
-   # KF5::KHtml
-   kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test)
+if (Qt5WebEngineWidgets_FOUND)
+  add_executable(konqviewmgrtest konqviewmgrtest.cpp)
+  add_test(konqviewmgrtest konqviewmgrtest)
+  ecm_mark_as_test(konqviewmgrtest)
+  target_link_libraries(konqviewmgrtest kdeinit_konqueror Qt5::Core Qt5::Gui
+     # KF5::KHtml
+     kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test)
+endif()
 
 ########### historymanagertest ###############
 
@@ -30,10 +32,12 @@ target_link_libraries(undomanagertest kdeinit_konqueror Qt5::Core Qt5::Test)
 
 ########### konqhtmltest ###############
 
-add_executable(konqhtmltest konqhtmltest.cpp)
-add_test(konqhtmltest konqhtmltest)
-ecm_mark_as_test(konqhtmltest)
-target_link_libraries(konqhtmltest kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test)
+if (Qt5WebEngineWidgets_FOUND)
+  add_executable(konqhtmltest konqhtmltest.cpp)
+  add_test(konqhtmltest konqhtmltest)
+  ecm_mark_as_test(konqhtmltest)
+  target_link_libraries(konqhtmltest kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test)
+endif()
 
 ########### konqviewtest ###############