From e5fb9607965fa588b75ec94a16c68ad2ff844a4d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 25 Apr 2023 09:13:18 +0200 Subject: Doc: Use qt_add_executable() not add_executable() in snippets Changes code snippets that are visible in the docs. Task-number: QTBUG-113116 Change-Id: If743234bfe6947acf02307bf1144daad4fba5d73 Reviewed-by: Joerg Bornemann (cherry picked from commit 3abfd4aa7c709202dbbd0d24f3a0cf4f6108fea5) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/doc/snippets/cmake-macros/examples.cmake | 10 +++++----- src/testlib/doc/snippets/code/doc_src_cmakelists.txt | 2 +- src/widgets/doc/snippets/cmake-macros/examples.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/corelib/doc/snippets/cmake-macros/examples.cmake b/src/corelib/doc/snippets/cmake-macros/examples.cmake index 2ed094cb72..3afaec0fda 100644 --- a/src/corelib/doc/snippets/cmake-macros/examples.cmake +++ b/src/corelib/doc/snippets/cmake-macros/examples.cmake @@ -4,17 +4,17 @@ #! [qt_wrap_cpp] set(SOURCES myapp.cpp main.cpp) qt_wrap_cpp(SOURCES myapp.h) -add_executable(myapp ${SOURCES}) +qt_add_executable(myapp ${SOURCES}) #! [qt_wrap_cpp] #! [qt_add_resources] set(SOURCES main.cpp) qt_add_resources(SOURCES example.qrc) -add_executable(myapp ${SOURCES}) +qt_add_executable(myapp ${SOURCES}) #! [qt_add_resources] #! [qt_add_resources_target] -add_executable(myapp main.cpp) +qt_add_executable(myapp main.cpp) qt_add_resources(myapp "images" PREFIX "/images" FILES image1.png image2.png) @@ -28,7 +28,7 @@ qt_add_big_resources(SOURCES big_resource.qrc) list(APPEND SOURCES big_resource.qrc) set_property(SOURCE big_resource.qrc PROPERTY SKIP_AUTORCC ON) -add_executable(myapp ${SOURCES}) +qt_add_executable(myapp ${SOURCES}) #! [qt_add_big_resources] #! [qt_add_binary_resources] @@ -41,7 +41,7 @@ qt_generate_moc(main.cpp main.moc TARGET myapp) #! [qt_generate_moc] #! [qt_import_plugins] -add_executable(myapp main.cpp) +qt_add_executable(myapp main.cpp) target_link_libraries(myapp Qt::Gui Qt::Sql) qt_import_plugins(myapp INCLUDE Qt::QCocoaIntegrationPlugin diff --git a/src/testlib/doc/snippets/code/doc_src_cmakelists.txt b/src/testlib/doc/snippets/code/doc_src_cmakelists.txt index 6e19597775..946f09c09f 100644 --- a/src/testlib/doc/snippets/code/doc_src_cmakelists.txt +++ b/src/testlib/doc/snippets/code/doc_src_cmakelists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) enable_testing(true) -add_executable(mytest tst_mytest.cpp) +qt_add_executable(mytest tst_mytest.cpp) add_test(NAME mytest COMMAND mytest) target_link_libraries(mytest PRIVATE Qt::Test) diff --git a/src/widgets/doc/snippets/cmake-macros/examples.cmake b/src/widgets/doc/snippets/cmake-macros/examples.cmake index d18f2fffb8..46749da194 100644 --- a/src/widgets/doc/snippets/cmake-macros/examples.cmake +++ b/src/widgets/doc/snippets/cmake-macros/examples.cmake @@ -4,5 +4,5 @@ #! [qt_wrap_ui] set(SOURCES mainwindow.cpp main.cpp) qt_wrap_ui(SOURCES mainwindow.ui) -add_executable(myapp ${SOURCES}) +qt_add_executable(myapp ${SOURCES}) #! [qt_wrap_ui] -- cgit v1.2.1