diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-10-05 16:16:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-09 15:02:41 +0000 |
| commit | fc4a8d18d772792db2e7b1c1b592c62cb638572b (patch) | |
| tree | 74c0129bfe8b0626ebf339dddd18d6313ac5b4a8 | |
| parent | 4aa6b0af739a8a27630d2d515c4ef47881a8ccfa (diff) | |
CMake: Do not use versionless targets in examples (Qt Core)
This is confusing, especially because it's not used in the whole snippet.
Change-Id: Ibd59646da2c77ac19a38441021c5e99f52015c95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4de97909b20ca86145c4e8f6d33f12f193ec218e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/doc/snippets/cmake-macros/examples.cmake | 6 | ||||
| -rw-r--r-- | src/corelib/doc/src/cmake-macros.qdoc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/doc/snippets/cmake-macros/examples.cmake b/src/corelib/doc/snippets/cmake-macros/examples.cmake index 913b39cb4f..820b28cf88 100644 --- a/src/corelib/doc/snippets/cmake-macros/examples.cmake +++ b/src/corelib/doc/snippets/cmake-macros/examples.cmake @@ -65,10 +65,10 @@ qt5_import_plugins(myapp #! [qt_import_plugins] add_executable(myapp main.cpp) -target_link_libraries(myapp Qt::Gui Qt::Sql) +target_link_libraries(myapp Qt5::Gui Qt5::Sql) qt_import_plugins(myapp - INCLUDE Qt::QCocoaIntegrationPlugin - EXCLUDE Qt::QMinimalIntegrationPlugin + INCLUDE Qt5::QCocoaIntegrationPlugin + EXCLUDE Qt5::QMinimalIntegrationPlugin INCLUDE_BY_TYPE imageformats Qt5::QGifPlugin Qt5::QJpegPlugin EXCLUDE_BY_TYPE sqldrivers ) diff --git a/src/corelib/doc/src/cmake-macros.qdoc b/src/corelib/doc/src/cmake-macros.qdoc index 8788554616..d595208449 100644 --- a/src/corelib/doc/src/cmake-macros.qdoc +++ b/src/corelib/doc/src/cmake-macros.qdoc @@ -406,11 +406,11 @@ This command was introduced in Qt 5.15. You can use \l qt5_import_plugins in old In the snippet above, the following occurs with the executable \c myapp: \list -\li The \c Qt::QCocoaIntegrationPlugin is imported into myapp. -\li The \c Qt::QMinimalIntegrationPlugin plugin is +\li The \c Qt5::QCocoaIntegrationPlugin is imported into myapp. +\li The \c Qt5::QMinimalIntegrationPlugin plugin is excluded from being automatically imported into myapp. \li The default list of plugins for \c imageformats is - overridden to only include Qt::QGifPlugin and Qt::QJpegPlugin. + overridden to only include Qt5::QGifPlugin and Qt5::QJpegPlugin. \li All \c sqldrivers plugins are excluded from automatic importing. \endlist */ |