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/sql/kernel | |
| 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/sql/kernel')
| -rw-r--r-- | tests/auto/sql/kernel/qsql/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqldriver/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlresult/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlthread/CMakeLists.txt | 5 |
6 files changed, 11 insertions, 18 deletions
diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt index 88c2d9ee3c..c3c3eac7d2 100644 --- a/tests/auto/sql/kernel/qsql/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt @@ -7,9 +7,7 @@ add_qt_test(tst_qsql SOURCES tst_qsql.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::SqlPrivate - PUBLIC_LIBRARIES - Qt::Sql ) diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt index ad0cefa460..ae64269c11 100644 --- a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqldatabase SOURCES tst_qsqldatabase.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt index a59ee08ea7..30ce3c1053 100644 --- a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqldriver SOURCES tst_qsqldriver.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt index dd7703b401..a5d3c96baa 100644 --- a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqlquery SOURCES tst_qsqlquery.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt index 91762a0f6c..c150c8a9d7 100644 --- a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_test(tst_qsqlresult SOURCES testsqldriver.h tst_qsqlresult.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt index 793e8c7fd5..17e66f42dd 100644 --- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qsqlthread SOURCES tst_qsqlthread.cpp - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Sql + Qt::SqlPrivate ) |