From a5799c121f704277dacc4182c1d2caa037d7fbe3 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 13 Nov 2020 11:28:28 +0000 Subject: [PATCH] Make QtWebEngine an optional requirement Forwarded: no Last-Update: 2020-05-02 This makes it possible to build konqueror, albeith without an HTML component, also on architectures that do not have QtWebEngine. Gbp-Pq: Name optional-qtwebengine.diff --- CMakeLists.txt | 7 +++++-- autotests/CMakeLists.txt | 12 ++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f25fdd..71ca76d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,8 @@ include(CMakePackageConfigHelpers) set(KONQUEROR_LIB_VERSION "${RELEASE_SERVICE_VERSION}") 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 Archive Crash WindowSystem Init IconThemes DBusAddons) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KDELibs4Support) @@ -66,7 +67,9 @@ add_subdirectory( client ) if(BUILD_TESTING) add_subdirectory( autotests ) endif() -add_subdirectory( webenginepart ) +if (Qt5WebEngineWidgets_FOUND) + add_subdirectory( webenginepart ) +endif() add_subdirectory( pics ) add_subdirectory( sidebar ) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 6366176..412f16b 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -7,8 +7,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) ########### konqviewmgrtest ############### -ecm_add_test(konqviewmgrtest.cpp - LINK_LIBRARIES kdeinit_konqueror Qt5::Core Qt5::Gui kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test) +if (Qt5WebEngineWidgets_FOUND) + ecm_add_test(konqviewmgrtest.cpp + LINK_LIBRARIES kdeinit_konqueror Qt5::Core Qt5::Gui kwebenginepartlib Qt5::WebEngineWidgets Qt5::Test) +endif() ########### historymanagertest ############### @@ -22,8 +24,10 @@ ecm_add_test(undomanagertest.cpp ########### konqhtmltest ############### -ecm_add_test(konqhtmltest.cpp - LINK_LIBRARIES kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test) +if (Qt5WebEngineWidgets_FOUND) + ecm_add_test(konqhtmltest.cpp + LINK_LIBRARIES kdeinit_konqueror kwebenginepartlib Qt5::Core Qt5::Test) +endif() ########### konqviewtest ############### -- 2.30.2