summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-03-24 21:15:50 +0100
committerMontel Laurent <[email protected]>2016-03-24 21:15:50 +0100
commitc224dfec415321b571e001d32b0d6a6591dc2be3 (patch)
tree487ccd27131ef442bcd6f053e91a5b177830d948
parent51f17acf7fce9a530ef16f5d3585dbcf0a44f731 (diff)
Rename variable
-rw-r--r--CMakeLists.txt4
-rw-r--r--messageviewer/src/CMakeLists.txt14
-rw-r--r--messageviewer/src/scamdetection/autotests/CMakeLists.txt2
-rw-r--r--messageviewer/src/scamdetection/tests/CMakeLists.txt2
4 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b3f91..3396eca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,9 +80,9 @@ find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
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)
-option(QTWEBENGINE_EXPERIMENTAL_OPTION "Enable support for qtwebengine. False by default." FALSE)
+option(QTWEBENGINE_SUPPORT_OPTION "Enable support for QtWebEngine. False by default." FALSE)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(QT_REQUIRED_MINIMUM_WEBENGINE_VERSION "5.6")
find_package(Qt5 ${QT_REQUIRED_MINIMUM_WEBENGINE_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets)
endif()
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 582bcaa..34e36a6 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -37,7 +37,7 @@ if(BUILD_TESTING)
add_subdirectory(adblock/tests/)
add_subdirectory(adblock/common/autotests)
add_subdirectory(viewerplugins/tests/)
- if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+ if (QTWEBENGINE_SUPPORT_OPTION)
add_subdirectory(webengine/tests)
add_subdirectory(viewer/webengine/autotests)
endif()
@@ -83,7 +83,7 @@ set(libmessageviewer_mailviewer_SRCS
set(libmessageviewer_web_LIB KF5::WebKit Qt5::WebKitWidgets)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(libmessageviewer_mailviewer_SRCS
viewer/webengine/mailwebengineview.cpp
viewer/webengine/mailwebenginepage.cpp
@@ -169,7 +169,7 @@ set(libmessageviewer_widgets_SRCS
widgets/zoomactionmenu.cpp
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(libmessageviewer_widgets_webengine_SRCS
widgets/mailsourcewebengineviewer.cpp
)
@@ -202,7 +202,7 @@ set(libmessageviewer_scamdetection_SRCS
scamdetection/scamcheckshorturlmanager.cpp
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(libmessageviewer_scamdetection_webengine_SRCS
scamdetection/scamdetectionwebengine.cpp
)
@@ -219,7 +219,7 @@ set(libmessageviewer_utils_SRCS
utils/messageviewerutil.cpp
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(libmessageviewer_htmlwriter_webengine_SRCS
htmlwriter/webengineparthtmlwriter.cpp
)
@@ -348,7 +348,7 @@ ecm_generate_headers(MessageViewer_Camelcasewebviewer_HEADERS
RELATIVE viewer/webview
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
ecm_generate_headers(MessageViewer_Camelcasewebengine_HEADERS
HEADER_NAMES
MailWebEnginePage
@@ -444,7 +444,7 @@ ecm_generate_headers(MessageViewer_Camelfindbar_HEADERS
RELATIVE findbar
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
ecm_generate_headers(MessageViewer_CamelfindbarWebEngine_HEADERS
HEADER_NAMES
FindBarWebEngineView
diff --git a/messageviewer/src/scamdetection/autotests/CMakeLists.txt b/messageviewer/src/scamdetection/autotests/CMakeLists.txt
index aedad69..e92591b 100644
--- a/messageviewer/src/scamdetection/autotests/CMakeLists.txt
+++ b/messageviewer/src/scamdetection/autotests/CMakeLists.txt
@@ -10,7 +10,7 @@ ecm_add_test(scamattributetest.cpp ../scamattribute.cpp
LINK_LIBRARIES Qt5::Test KF5::AkonadiCore
)
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
ecm_add_test(scamdetectionwebenginetest.cpp
TEST_NAME scamdetectionwebenginetest
NAME_PREFIX "messageviewer-scamwebenginedetection-"
diff --git a/messageviewer/src/scamdetection/tests/CMakeLists.txt b/messageviewer/src/scamdetection/tests/CMakeLists.txt
index ea2d39e..202ac82 100644
--- a/messageviewer/src/scamdetection/tests/CMakeLists.txt
+++ b/messageviewer/src/scamdetection/tests/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(scamdetection_gui
-if (QTWEBENGINE_EXPERIMENTAL_OPTION)
+if (QTWEBENGINE_SUPPORT_OPTION)
set(scamdetectionwebengine_gui_SRCS scamdetectionwebengine_gui.cpp)
add_executable(scamdetectionwebengine_gui ${scamdetectionwebengine_gui_SRCS})
target_link_libraries(scamdetectionwebengine_gui