diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-13 10:52:32 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-13 10:52:32 +0200 |
| commit | 97e6be5d5b218f537cf82f4ddf92007843001124 (patch) | |
| tree | 719761136dc6448da0ad999dbe073bebe69feb39 | |
| parent | cae291161f323df54aabf5333f485352a8d84e6e (diff) | |
| parent | 4bce183390c6a4633dd46d0b0cd4c1c24877fe87 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Iba0e12721ec9ab0fc70b078f73dc4ec89df05aa3
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
4 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 0000000..330bccf --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + cmake \ diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 0000000..cac7528 --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +add_test(dummy ${CMAKE_COMMAND} -E echo) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 0000000..baaef7d --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,6 @@ +# Cause make to do nothing. +TEMPLATE = subdirs + +CMAKE_QT_MODULES_UNDER_TEST = scenegraph-raster + +CONFIG += ctest_testcase diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..15dd97b --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +CONFIG += no_docs_target +SUBDIRS = auto |