diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:27:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:28:15 +0100 |
commit | 8592ae4096f3f9c2b08b87ad2fcbbbfadf75f2d7 (patch) | |
tree | a757c1d80ec77952eae2cc4de5d89c01f14760fc /tests/auto/cmake/CMakeLists.txt | |
parent | e7decc7637e9eb7e66a0d19705090f18488028c0 (diff) | |
parent | 14492ecee2e34843efd3ef070503a43a48552055 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
dependencies.yaml
Change-Id: Ifff48b9d0e7962d481e63c49399e2d304e1011e5
Diffstat (limited to 'tests/auto/cmake/CMakeLists.txt')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index bda5d626a9..de776e9dd1 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,4 +1,3 @@ - cmake_minimum_required(VERSION 2.8) project(qmake_cmake_files) @@ -26,6 +25,7 @@ add_test(qtquickcompiler ${CMAKE_CTEST_COMMAND} --build-project qqc_test --build-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} --test-command qqc_test + ) add_test(qmlimportscanner ${CMAKE_CTEST_COMMAND} |