From dad007e2f5acdb5f307a391d0f9381d97cd3ece8 Mon Sep 17 00:00:00 2001 From: Debian/Kubuntu Qt/KDE Maintainers Date: Thu, 28 Dec 2017 12:03:23 +0000 Subject: [PATCH] optional-qtwebengine Gbp-Pq: Name optional-qtwebengine.diff --- CMakeLists.txt | 7 +++++-- autotests/CMakeLists.txt | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8f59f0..26f5692 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,8 @@ include(ECMQtDeclareLoggingCategory) 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 @@ -53,7 +54,9 @@ add_subdirectory( libkonq ) add_subdirectory( src ) add_subdirectory( client ) add_subdirectory( autotests ) -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 09c1a28..27939c0 100644 --- 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 ############### -- 2.30.2