diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
| commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
| tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /tests/auto/cmake/CMakeLists.txt | |
| parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
| parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'tests/auto/cmake/CMakeLists.txt')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index a88564e0b7..f62d2f3bdb 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 Network Gui) - test_module_includes( Qml QQmlEngine Quick QQuickWindow |