From afb7d3b814ee30ae9673a925612fcd2ed676c661 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 8 Sep 2021 18:02:10 +1000 Subject: [PATCH] Update Qt5:: namespaced targets in snippets to versionless Qt:: The docs for CMake commands all show the versionless commands as the primary name, with versioned commands added as a note. Use the same preference for targets for consistency and update the Qt5:: namespaces to Qt:: rather than Qt6::. Task-number: QTBUG-95712 Pick-to: 6.2 6.2.0 Change-Id: I6bf1929a11656f88e27bb5877e9521a3a651361e Reviewed-by: Alexandru Croitor --- src/corelib/doc/snippets/cmake-macros/examples.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/doc/snippets/cmake-macros/examples.cmake b/src/corelib/doc/snippets/cmake-macros/examples.cmake index caf442c84c..a4def96600 100644 --- a/src/corelib/doc/snippets/cmake-macros/examples.cmake +++ b/src/corelib/doc/snippets/cmake-macros/examples.cmake @@ -34,11 +34,11 @@ qt_generate_moc(main.cpp main.moc TARGET myapp) #! [qt_import_plugins] add_executable(myapp main.cpp) -target_link_libraries(myapp Qt5::Gui Qt5::Sql) +target_link_libraries(myapp Qt::Gui Qt::Sql) qt_import_plugins(myapp - INCLUDE Qt5::QCocoaIntegrationPlugin - EXCLUDE Qt5::QMinimalIntegrationPlugin - INCLUDE_BY_TYPE imageformats Qt5::QGifPlugin Qt5::QJpegPlugin + INCLUDE Qt::QCocoaIntegrationPlugin + EXCLUDE Qt::QMinimalIntegrationPlugin + INCLUDE_BY_TYPE imageformats Qt::QGifPlugin Qt::QJpegPlugin EXCLUDE_BY_TYPE sqldrivers ) #! [qt_import_plugins]