diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-02 16:03:37 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-03 13:44:42 +0200 |
| commit | 5418f5795e2fd657efa3ceede749228c1e10d25c (patch) | |
| tree | 0d3109f25ab416befbaa44ba26f1380d64b30db6 /tests/auto/cmake | |
| parent | 3c1884f15ed1120bf36efb918cad0bcb461d5193 (diff) | |
| download | qtwebchannel-5418f5795e2fd657efa3ceede749228c1e10d25c.tar.gz | |
Add cmake test, adapt test directory layout and point to dev branches.
The auto tests are now located in tests/auto instead of directly in
tests/. This is required to ensure the cmake test is found.
Furthermore, the sync.profile is updated to point to refs/heads/dev,
as we target Qt 5.4 with this new module.
Change-Id: I1e6e99968b7081b5774eaf30319cac1fbaed35c2
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 0000000..1d588ac --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,14 @@ + +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +test_module_includes( + WebChannel QWebChannel +) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 0000000..54d329c --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,7 @@ + +# Cause make to do nothing. +TEMPLATE = subdirs + +CMAKE_QT_MODULES_UNDER_TEST = webchannel + +CONFIG += ctest_testcase |