diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:01:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:35 +0200 |
| commit | e9a328bc0e56b429a370b13c8e0b4790916cebde (patch) | |
| tree | 059f3b089a8557cb4c45e3dc059b58e020e34dcb /tests/auto/tools | |
| parent | 5417f1e40cb647c05bffad21493feacac45f193e (diff) | |
CMake: Regenerate tests with new qt_ prefixed APIs
Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.
Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/qdbuscpp2xml/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/tools/qdbusxml2cpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/tools/qmakelib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/tools/uic/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt index eaceac37b3..83819cf2c6 100644 --- a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt +++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbuscpp2xml Test: ##################################################################### -add_qt_test(tst_qdbuscpp2xml +qt_add_test(tst_qdbuscpp2xml SOURCES test1.h tst_qdbuscpp2xml.cpp @@ -17,7 +17,7 @@ set(qdbuscpp2xml_resource_files "test1.h" ) -add_qt_resource(tst_qdbuscpp2xml "qdbuscpp2xml" +qt_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml" PREFIX "/tst_qdbuscpp2xml/" FILES diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt index 8095421637..6a24094462 100644 --- a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt +++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdbusxml2cpp Test: ##################################################################### -add_qt_test(tst_qdbusxml2cpp +qt_add_test(tst_qdbusxml2cpp SOURCES tst_qdbusxml2cpp.cpp ) diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt index 48b88a2285..adb2da7916 100644 --- a/tests/auto/tools/qmake/CMakeLists.txt +++ b/tests/auto/tools/qmake/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob testdata/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qmake +qt_add_test(tst_qmake SOURCES testcompiler.cpp testcompiler.h tst_qmake.cpp diff --git a/tests/auto/tools/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt index abb8e62c95..c95ef2fe0f 100644 --- a/tests/auto/tools/qmakelib/CMakeLists.txt +++ b/tests/auto/tools/qmakelib/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmakelib Test: ##################################################################### -add_qt_test(tst_qmakelib +qt_add_test(tst_qmakelib SOURCES ../../../../qmake/library/ioutils.cpp ../../../../qmake/library/proitems.cpp @@ -29,7 +29,7 @@ add_qt_test(tst_qmakelib ## Scopes: ##################################################################### -extend_target(tst_qmakelib CONDITION WIN32 +qt_extend_target(tst_qmakelib CONDITION WIN32 PUBLIC_LIBRARIES advapi32 ) diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt index f7d91dccbe..2f8b8aa648 100644 --- a/tests/auto/tools/uic/CMakeLists.txt +++ b/tests/auto/tools/uic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_uic Test: ##################################################################### -add_qt_test(tst_uic +qt_add_test(tst_uic SOURCES tst_uic.cpp ) |