From bc2a7672ec41378ea7638c9c23ddd116139991db Mon Sep 17 00:00:00 2001 From: Debian/Kubuntu Qt/KDE Maintainers Date: Thu, 4 Apr 2019 14:53:23 +0100 Subject: [PATCH] make_qtwebengine_optional Gbp-Pq: Name make_qtwebengine_optional.patch --- CMakeLists.txt | 3 ++- resources/CMakeLists.txt | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 996c61a5..90394d66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,8 @@ find_package(Sasl2) set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED) # QT5 package -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus WebEngineWidgets) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus) +find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets) find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech) if (NOT Qt5TextToSpeech_FOUND) message(STATUS "Qt5TextToSpeech not found, speech feature will be disabled") diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 86dbb79e..742d7cc0 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -45,7 +45,6 @@ add_subdirectory( imap ) if (Libkolabxml_FOUND) add_subdirectory( kolab ) endif() -add_subdirectory( facebook ) add_subdirectory( maildir ) add_subdirectory( openxchange ) @@ -54,9 +53,15 @@ add_subdirectory( pop3 ) if (KPimGAPI_FOUND) add_subdirectory( google ) endif() + # Disabled in KDE 4.14 - too many issues for stable release #add_subdirectory( gmail ) +if (Qt5WebEngineWidgets_FOUND) + add_subdirectory( facebook ) + add_subdirectory( tomboynotes ) +endif() + add_subdirectory( shared ) add_subdirectory( birthdays ) add_subdirectory( mixedmaildir ) @@ -65,5 +70,4 @@ add_subdirectory( vcarddir ) add_subdirectory( icaldir ) add_subdirectory( vcard ) add_subdirectory( folderarchivesettings ) -add_subdirectory( tomboynotes ) add_subdirectory( ews ) -- 2.30.2