Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Add-ons
Commits
caeb683e
Commit
caeb683e
authored
Jan 10, 2022
by
Laurent Montel
😁
Browse files
Qt5::WebEngine doesn't exist in qt6 and it's not necessary for qt5 build
parent
0b4ccd79
Pipeline
#121574
passed with stage
in 15 minutes and 21 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
caeb683e
...
...
@@ -51,7 +51,7 @@ include(ECMQtDeclareLoggingCategory)
option
(
KDEPIM_ENTERPRISE_BUILD
"Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client."
FALSE
)
find_package
(
Qt5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED
WebEngine
WebEngineWidgets Widgets Test
)
find_package
(
Qt5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED WebEngineWidgets Widgets Test
)
find_package
(
KF5I18n
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
find_package
(
KF5Config
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
...
...
plugins/webengineurlinterceptor/adblock/CMakeLists.txt
View file @
caeb683e
...
...
@@ -18,7 +18,6 @@ ecm_qt_declare_logging_category(webengineviewer_adblockplugin HEADER adblockinte
target_link_libraries
(
webengineviewer_adblockplugin
KF5::MessageViewer
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets
KF5::ItemViews
adblocklibprivate
...
...
plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt
View file @
caeb683e
...
...
@@ -6,13 +6,13 @@ ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER ad
ecm_add_test
(
adblockmanagertest.cpp
${
messageviewer_adblock_test_common_SRCS
}
TEST_NAME adblockmanagertest
NAME_PREFIX
"messageviewer-urlinterceptor-"
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets adblocklibprivate KF5::ItemViews
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets adblocklibprivate KF5::ItemViews Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer
)
ecm_add_test
(
adblockinterceptorinterfacetest.cpp
${
messageviewer_adblock_test_common_SRCS
}
../adblockinterceptorinterface.cpp
TEST_NAME adblockinterceptorinterface
NAME_PREFIX
"messageviewer-urlinterceptor-"
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets adblocklibprivate KF5::ItemViews
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer KF5::XmlGui
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets adblocklibprivate KF5::ItemViews Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer KF5::XmlGui
)
set
(
adblockpluginurlinterceptortest_SRCS
${
messageviewer_adblock_test_common_SRCS
}
adblockpluginurlinterceptortest.cpp ../adblockpluginurlinterceptor.cpp ../adblockinterceptorinterface.cpp
)
...
...
@@ -20,4 +20,4 @@ add_executable( adblockpluginurlinterceptortest ${adblockpluginurlinterceptortes
add_test
(
NAME adblockpluginurlinterceptortest COMMAND adblockpluginurlinterceptortest
)
ecm_mark_as_test
(
adblockpluginurlinterceptortest
)
target_link_libraries
(
adblockpluginurlinterceptortest Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets adblocklibprivate KF5::MessageViewer
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ItemViews KF5::KIOWidgets KF5::XmlGui KF5::I18n KF5::WebEngineViewer
)
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ItemViews KF5::KIOWidgets KF5::XmlGui KF5::I18n KF5::WebEngineViewer
)
plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
View file @
caeb683e
...
...
@@ -56,7 +56,7 @@ generate_export_header(adblocklibprivate BASE_NAME adblocklib)
target_link_libraries
(
adblocklibprivate
PRIVATE
Qt
${
QT_MAJOR_VERSION
}
::Core
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets
KF5::I18n
KF5::ItemViews
...
...
plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt
View file @
caeb683e
...
...
@@ -9,7 +9,7 @@ add_executable( adblockpluginurlinterceptorconfigurewidgettest ${adblockpluginur
add_test
(
NAME adblockpluginurlinterceptorconfigurewidgettest COMMAND adblockpluginurlinterceptorconfigurewidgettest
)
ecm_mark_as_test
(
adblockpluginurlinterceptorconfigurewidgettest
)
target_link_libraries
(
adblockpluginurlinterceptorconfigurewidgettest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets KF5::MessageViewer
KF5::ItemViews
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer
)
KF5::ItemViews Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::KIOWidgets KF5::I18n KF5::WebEngineViewer
)
set
(
adblockblockableitemsdialogtest_SRCS
${
messageviewer_adblock_test_common_SRCS
}
adblockblockableitemsdialogtest.cpp
)
...
...
@@ -17,18 +17,18 @@ add_executable( adblockblockableitemsdialogtest ${adblockblockableitemsdialogtes
add_test
(
NAME adblockblockableitemsdialogtest COMMAND adblockblockableitemsdialogtest
)
ecm_mark_as_test
(
adblockblockableitemsdialogtest
)
target_link_libraries
(
adblockblockableitemsdialogtest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets KF5::I18n KF5::MessageViewer
KF5::PimCommon KF5::ItemViews
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ConfigCore KF5::KIOWidgets KF5::WebEngineViewer
)
KF5::PimCommon KF5::ItemViews Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ConfigCore KF5::KIOWidgets KF5::WebEngineViewer
)
set
(
adblockblockableitemsjobtest_SRCS
${
messageviewer_adblock_test_common_SRCS
}
adblockblockableitemsjobtest.cpp
)
add_executable
(
adblockblockableitemsjobtest
${
adblockblockableitemsjobtest_SRCS
}
)
add_test
(
NAME adblockblockableitemsjobtest COMMAND adblockblockableitemsjobtest
)
ecm_mark_as_test
(
adblockblockableitemsjobtest
)
target_link_libraries
(
adblockblockableitemsjobtest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::I18n KF5::WebEngineViewer
)
target_link_libraries
(
adblockblockableitemsjobtest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::I18n KF5::WebEngineViewer
)
set
(
adblockresulttest_SRCS
${
messageviewer_adblock_test_common_SRCS
}
adblockresulttest.cpp
)
add_executable
(
adblockresulttest
${
adblockresulttest_SRCS
}
)
add_test
(
NAME adblockresulttest COMMAND adblockresulttest
)
ecm_mark_as_test
(
adblockresulttest
)
target_link_libraries
(
adblockresulttest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::WebEngineViewer
)
target_link_libraries
(
adblockresulttest adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::WebEngineViewer
)
plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt
View file @
caeb683e
...
...
@@ -4,6 +4,6 @@ add_executable(adblockblockableelementgui ${adblockblockableelementgui_SRCS})
target_sources
(
adblockblockableelementgui PRIVATE adblockblockableelementgui.cpp
)
ecm_qt_declare_logging_category
(
adblockblockableelementgui HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor
)
target_link_libraries
(
adblockblockableelementgui
KF5::MessageViewer
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ItemViews KF5::KIOWidgets KF5::MessageViewer KF5::WebEngineViewer
KF5::MessageViewer adblocklibprivate Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::ItemViews KF5::KIOWidgets KF5::MessageViewer KF5::WebEngineViewer
)
plugins/webengineurlinterceptor/donottrack/CMakeLists.txt
View file @
caeb683e
...
...
@@ -24,7 +24,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
endif
()
target_link_libraries
(
webengineviewer_donottrackplugin
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets
KF5::WebEngineViewer
KF5::ConfigGui
...
...
plugins/webengineurlinterceptor/donottrack/autotests/CMakeLists.txt
View file @
caeb683e
...
...
@@ -7,4 +7,4 @@ kconfig_add_kcfg_files(donottrackpluginurlinterceptortest_SRCS
add_executable
(
donottrackpluginurlinterceptortest
${
donottrackpluginurlinterceptortest_SRCS
}
)
add_test
(
NAME donottrackpluginurlinterceptortest COMMAND donottrackpluginurlinterceptortest
)
ecm_mark_as_test
(
donottrackpluginurlinterceptortest
)
target_link_libraries
(
donottrackpluginurlinterceptortest Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets KF5::MessageViewer
Qt
${
QT_MAJOR_VERSION
}
::WebEngine
Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::WebEngineViewer
)
target_link_libraries
(
donottrackpluginurlinterceptortest Qt
${
QT_MAJOR_VERSION
}
::Test Qt
${
QT_MAJOR_VERSION
}
::Widgets KF5::MessageViewer Qt
${
QT_MAJOR_VERSION
}
::WebEngineWidgets KF5::WebEngineViewer
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment