From f7ee1bfe6be8ac9d945ed73ded36e493ca25aea9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 3 Jun 2020 16:54:16 +0200 Subject: [PATCH] Doc: Update CMake snippets to Qt 6 Change-Id: I53021781a25c141db5d5fc6771192cd8d6ed732a Reviewed-by: Edward Welbourne Reviewed-by: Alexandru Croitor Reviewed-by: Paul Wicking --- src/corelib/doc/snippets/overview/using-qt-core.cmake | 4 ++-- src/gui/doc/snippets/overview/using-qt-gui.cmake | 4 ++-- src/testlib/doc/snippets/code/doc_src_cmakelists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/doc/snippets/overview/using-qt-core.cmake b/src/corelib/doc/snippets/overview/using-qt-core.cmake index a5f43c1472c..ce388e60c58 100644 --- a/src/corelib/doc/snippets/overview/using-qt-core.cmake +++ b/src/corelib/doc/snippets/overview/using-qt-core.cmake @@ -1,2 +1,2 @@ -find_package(Qt5 COMPONENTS Core REQUIRED) -target_link_libraries(mytarget Qt5::Core) +find_package(Qt6 COMPONENTS Core REQUIRED) +target_link_libraries(mytarget Qt::Core) diff --git a/src/gui/doc/snippets/overview/using-qt-gui.cmake b/src/gui/doc/snippets/overview/using-qt-gui.cmake index aecfa458a02..2ed8613ac64 100644 --- a/src/gui/doc/snippets/overview/using-qt-gui.cmake +++ b/src/gui/doc/snippets/overview/using-qt-gui.cmake @@ -1,2 +1,2 @@ -find_package(Qt5 COMPONENTS Gui REQUIRED) -target_link_libraries(mytarget Qt5::Gui) +find_package(Qt6 COMPONENTS Gui REQUIRED) +target_link_libraries(mytarget Qt::Gui) diff --git a/src/testlib/doc/snippets/code/doc_src_cmakelists.txt b/src/testlib/doc/snippets/code/doc_src_cmakelists.txt index 96dbe1acee3..5e292a6417e 100644 --- a/src/testlib/doc/snippets/code/doc_src_cmakelists.txt +++ b/src/testlib/doc/snippets/code/doc_src_cmakelists.txt @@ -1,6 +1,6 @@ project(mytest LANGUAGES CXX) -find_package(Qt5Test REQUIRED) +find_package(Qt6 COMPONENTS Test REQUIRED) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -11,4 +11,4 @@ enable_testing(true) add_executable(mytest tst_mytest.cpp) add_test(NAME mytest COMMAND mytest) -target_link_libraries(mytest PRIVATE Qt5::Test) +target_link_libraries(mytest PRIVATE Qt::Test)