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/corelib/time | |
| 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/corelib/time')
| -rw-r--r-- | tests/auto/corelib/time/qdate/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index 9a90956bd6..b39828b5df 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdate SOURCES tst_qdate.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt index b215ca6efa..e992936e60 100644 --- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qdatetime SOURCES tst_qdatetime.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt index 7d9a8ccc88..d95a2ac767 100644 --- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qtimezone SOURCES tst_qtimezone.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) |