summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-12-12 15:28:33 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-12-12 17:03:20 +0100
commit75b979f2f0bf3eaf623595b5bc8c3d5959194f72 (patch)
treee96b8e00c074b2c873b23f96ca054086fe9c7718
parent6e3a42635a7b0fe0559723cd368e63ad5ecfa74f (diff)
Enable cmake config files generation
As QtWebEngine now uses 5.x as its version number, we can just provide cmake tests and let qmake scripts do the rest. Task-number: QTBUG-42073 Change-Id: I28ccddbd1849980074dfbeefb5cb5a70c9209ab1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-rw-r--r--src/core/core_module.pro2
-rw-r--r--src/webengine/webengine.pro2
-rw-r--r--src/webenginewidgets/webenginewidgets.pro2
-rw-r--r--tests/auto/cmake/CMakeLists.txt16
-rw-r--r--tests/auto/cmake/cmake.pro8
5 files changed, 24 insertions, 6 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index ceb24837..14f24914 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 6f48e9d4..4c460669 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 71240cba..4da888ba 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 00000000..d3c0651d
--- /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 00000000..51d30da6
--- /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