1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Do not use versionless targets in examples (Qt Core)

Browse Source 
This is confusing, especially because it's not used in the whole snippet.

Pick-to: 5.15
Change-Id: Ibd59646da2c77ac19a38441021c5e99f52015c95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Kai Koehne 2020-10-05 16:16:13 +02:00
parent c2fde55976
commit 4de97909b2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/doc/snippets/cmake-macros/examples.cmake
View File

@ -65,10 +65,10 @@ qt5_import_plugins(myapp
#! [qt_import_plugins] #! [qt_import_plugins]
add_executable(myapp main.cpp) 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 qt_import_plugins(myapp
INCLUDE Qt::QCocoaIntegrationPlugin INCLUDE Qt5::QCocoaIntegrationPlugin
EXCLUDE Qt::QMinimalIntegrationPlugin EXCLUDE Qt5::QMinimalIntegrationPlugin
INCLUDE_BY_TYPE imageformats Qt5::QGifPlugin Qt5::QJpegPlugin INCLUDE_BY_TYPE imageformats Qt5::QGifPlugin Qt5::QJpegPlugin
EXCLUDE_BY_TYPE sqldrivers EXCLUDE_BY_TYPE sqldrivers
) )

6
src/corelib/doc/src/cmake-macros.qdoc
View File

@ -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: In the snippet above, the following occurs with the executable \c myapp:
\list \list
\li The \c Qt::QCocoaIntegrationPlugin is imported into myapp. \li The \c Qt5::QCocoaIntegrationPlugin is imported into myapp.
\li The \c Qt::QMinimalIntegrationPlugin plugin is \li The \c Qt5::QMinimalIntegrationPlugin plugin is
excluded from being automatically imported into myapp. excluded from being automatically imported into myapp.
\li The default list of plugins for \c imageformats is \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. \li All \c sqldrivers plugins are excluded from automatic importing.
\endlist \endlist
*/ */