diff options
| -rw-r--r-- | src/core/core_module.pro | 2 | ||||
| -rw-r--r-- | src/webengine/webengine.pro | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 8 |
5 files changed, 24 insertions, 6 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index ceb248372..14f249142 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -1,8 +1,6 @@ MODULE = webenginecore TARGET = QtWebEngineCore -CMAKE_MODULE_TESTS = "-" - QT += qml quick QT_PRIVATE += gui-private diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 6f48e9d49..4c4606690 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,7 +1,5 @@ TARGET = QtWebEngine -CMAKE_MODULE_TESTS = "-" - # For our export macros DEFINES += QT_BUILD_WEBENGINE_LIB diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 71240cbaf..4da888baa 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -1,7 +1,5 @@ TARGET = QtWebEngineWidgets -CMAKE_MODULE_TESTS = "-" - # For our export macros DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 000000000..d3c0651d1 --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,16 @@ + +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +if (NOT NO_WIDGETS) + test_module_includes( + WebEngineWidgets QWebEngineView + ) +endif() diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 000000000..51d30da67 --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,8 @@ + +# Cause make to do nothing. +TEMPLATE = subdirs + +CMAKE_QT_MODULES_UNDER_TEST = webengine +qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST += webenginewidgets + +CONFIG += ctest_testcase |