summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-14 10:30:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-01-14 10:30:35 +0100
commita38215f03d20ccbe2e15c16d0a4e3333614cb682 (patch)
tree0286e23d4edfab7e40198f25d1861dac3e0d7e38 /tests
parentda3c744b6a97660aae34067466d9624e1ca688e4 (diff)
parent7a318602581fac0d4ad414ee62437554e9c9e959 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/cmake/CMakeLists.txt16
-rw-r--r--tests/auto/cmake/cmake.pro8
2 files changed, 24 insertions, 0 deletions
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