diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2023-05-02 12:25:58 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-05-02 12:03:42 +0000 |
| commit | 835f15cfbb628938fcd7bfa4e334dec6199e54c6 (patch) | |
| tree | 4fe262bce1e25eb99a578097d844440a1454cbc5 /tests | |
| parent | 3705d584d766098dc75fdcc87eb03658ae77be44 (diff) | |
| download | qtdoc-835f15cfbb628938fcd7bfa4e334dec6199e54c6.tar.gz | |
Use versioned CMake targets for Qt modules
Use e.g. Qt6::Core instead of Qt::Core. This is better matching the
find_package(Qt6 ...) call, and also avoids issues that the versionless
targets have.
Pick-to: 6.5
Task-number: QTBUG-113277
Change-Id: I9bc7963d8524ef2ab061e32aef428711646247a7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlparser/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/quick/examples/CMakeLists.txt | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index f7bf2206..a39a6204 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -3,9 +3,9 @@ # Generated from auto.pro. -if(TARGET Qt::Quick) +if(TARGET Qt6::Quick) add_subdirectory(quick) endif() -if(TARGET Qt::Qml) +if(TARGET Qt6::Qml) add_subdirectory(qml) endif() diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index 7af990e9..e6f8bca0 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -13,8 +13,8 @@ qt_internal_add_test(tst_qqmlparser_doc # special case DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES - Qt::Gui - Qt::QmlPrivate + Qt6::Gui + Qt6::QmlPrivate ) ## Scopes: diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index ae8c4a62..0e65c930 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -13,11 +13,11 @@ qt_internal_add_test(tst_examples DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate + Qt6::CorePrivate + Qt6::Gui + Qt6::GuiPrivate + Qt6::QmlPrivate + Qt6::QuickPrivate ) #### Keys ignored in scope 1:.:.:examples.pro:<TRUE>: @@ -26,7 +26,7 @@ qt_internal_add_test(tst_examples ## Scopes: ##################################################################### -qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt::XmlPatterns +qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt6::XmlPatterns DEFINES QT_NO_XMLPATTERNS ) |