diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:32:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:32:48 +0100 |
| commit | 1b7f0be6ebbabbdabeb1916578de6b453d8292d0 (patch) | |
| tree | 845771f8221c6d2cdc15a56cd9b19fb8c7773131 | |
| parent | ec9fe87220829f2f6f3940f714a8057c5f79e799 (diff) | |
| parent | ecd2782929ff8f2a7d2889083fbbca6b2a600777 (diff) | |
| download | qtsensors-1b7f0be6ebbabbdabeb1916578de6b453d8292d0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id09708fc6096716d25f541ba55de2ada6f2d385d
| -rw-r--r-- | sync.profile | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sync.profile b/sync.profile index 9e398bd..9aa7357 100644 --- a/sync.profile +++ b/sync.profile @@ -5,6 +5,7 @@ ); %dependencies = ( "qtbase" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", "qtdeclarative" => "refs/heads/dev", "qtjsbackend" => "refs/heads/dev", ); diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 2c8e39e..4eba860 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,8 +9,6 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(Qt5_MODULE_TEST_DEPENDS Core) - test_module_includes( Sensors QLightSensor ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb..f8c4e0a 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,4 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs +CMAKE_QT_MODULES_UNDER_TEST = sensors + CONFIG += ctest_testcase |