summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-02 12:29:06 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-02 12:29:06 +0100
commit7a318602581fac0d4ad414ee62437554e9c9e959 (patch)
treea529e1cdee56947fd6194eee7f38987c06ca9a1a /tests
parent54e05945b0ec4328b9d56b3b6a9886fc24ad3e6a (diff)
parentf8bdc6c7de5ace3ff4b0335cf425e0ebb21ed75d (diff)
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts: .qmake.conf src/3rdparty src/core/content_browser_client_qt.h src/core/core_module.pro Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
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