diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-05-11 13:16:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-13 07:38:03 +0000 |
| commit | bce1fd6773634859764700451c36de3eff7f27ce (patch) | |
| tree | b0095039ed592a604936eeda4ccfad686600acb6 | |
| parent | ca5398503770a342c4502a407e867f41a2bb9c36 (diff) | |
Doc: Use find_package(Qt6 REQUIRED COMPONENTS ...) idiom
Using REQUIRED as a prefix instead of suffix works better with
OPTIONAL_COMPONENTS, and is also the order in the CMake manual.
Also replace a non-breaking space (c2 a0) with a normal one.
Task-number: QTBUG-98867
Change-Id: I4cfbba7e54ea35db4654dda06bae82bda752e0c2
Reviewed-by: Rui Oliveira
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 121082df1f52568ac08b0a5904358f00450b0a67)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/doc/snippets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/doc/snippets/CMakeLists.txt b/src/multimedia/doc/snippets/CMakeLists.txt index 1292fabe3..e178b6c10 100644 --- a/src/multimedia/doc/snippets/CMakeLists.txt +++ b/src/multimedia/doc/snippets/CMakeLists.txt @@ -7,6 +7,6 @@ add_executable(mytarget ) # ![0] -find_package(Qt6 COMPONENTS Multimedia REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Multimedia) target_link_libraries(mytarget PRIVATE Qt6::Multimedia) # ![0] diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc index b122a1209..9e9d78233 100644 --- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc +++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc @@ -31,7 +31,7 @@ \brief An add-on module which provides multimedia-related widgets. Qt Multimedia Widgets provides additional multimedia-related widgets and -controls. The classes expand the capabilities of the \l{Qt Multimedia} and +controls. The classes expand the capabilities of the \l{Qt Multimedia} and \l{Qt Widgets} modules. \section1 Getting Started @@ -46,7 +46,7 @@ To link against the C++ libraries, add the following to your project's \c CMakeLists.txt file. Substitute \c my_project with the name of your project. \code -find_package(Qt6 COMPONENTS MultimediaWidgets REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS MultimediaWidgets) target_link_libraries(my_project PUBLIC Qt::MultimediaWidgets) \endcode |