diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:27:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:29:51 +0100 |
| commit | c53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch) | |
| tree | ffdc87c81c72b545602c7380bbde3f0ab5c499e0 /tests/auto/testlib/selftests/badxml | |
| parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) | |
| parent | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.
Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'tests/auto/testlib/selftests/badxml')
| -rw-r--r-- | tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/badxml/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt index 7840ba51ba..755cbecd2e 100644 --- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_executable(badxml SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt index c26edd4d08..40870b1983 100644 --- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt @@ -9,9 +9,8 @@ add_qt_executable(badxml OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) |