summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2022-04-29 11:21:29 +0200
committerKai Köhne <kai.koehne@qt.io>2022-05-31 14:02:08 +0200
commit33c68876d4fd5bda2e602ac1ff70cecfcc87544c (patch)
treed2d5b54584bda2dafd3b4d1f2d79abcbf4868ee8
parente6993595c3338c1c2754b2d8b0b3c8db65cb5b3b (diff)
Doc: Landing page cleanup
Fix inconsistency with \section1 vs \section2. Also merge Reference and Examples section into one, and use title case consistenly. Replace reference to 'Qt Quick Multimedia' with 'Qt Multimedia', and use consistent style of find_package(). Change-Id: I77aec63629dae85096bb4f98dbfd7af5174de443 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit b4b6a66e071e4d9fcef19e0bc4f4645fa5a8a0db)
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc25
1 files changed, 9 insertions, 16 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index e3c7fed37..b10b0bd41 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -88,8 +88,8 @@
project.
\code
- find_package(Qt6 COMPONENTS Multimedia REQUIRED)
- target_link_libraries(my_project PUBLIC Qt::Multimedia)
+ find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+ target_link_libraries(my_project PRIVATE Qt6::Multimedia)
\endcode
\section1 Overviews and Important Topics
@@ -185,9 +185,9 @@
The other classes are used for capturing audio and video content, where the QMediaCaptureSession is the central
class managing the whole capture/recording process.
- \section1 Licenses and attributions
+ \section1 Licenses and Attributions
- The Qt Quick Multimedia module is available under commercial licenses from
+ The Qt Multimedia module is available under commercial licenses from
\l{The Qt Company}.
In addition, it is available under free software licenses. Since Qt 5.6,
these free software licenses are
@@ -195,7 +195,7 @@
the \l{GNU General Public License, version 2}.
See \l{Qt Licensing} for further details.
- \section2 Platform notes
+ \section1 Platform Notes
For most features, Qt Multimedia builds upon the multimedia framework of the
underlying operating system. Therefore there are several multimedia back ends
@@ -214,17 +214,10 @@
\li \l{Qt Multimedia on macOS and iOS}{macOS and iOS}
\endlist
- \section2 Reference
+ \section1 Reference and Examples
\list
- \li Qt Multimedia
- \list
- \li \l{Qt Multimedia QML Types}{QML Types}
- \li \l{Qt Multimedia C++ Classes}{C++ Classes}
- \endlist
+ \li \l{Qt Multimedia QML Types}{QML Types}
+ \li \l{Qt Multimedia C++ Classes}{C++ Classes}
+ \li \l{Qt Multimedia Examples}{Examples}
\endlist
-
- \section2 Examples
- \list
- \li \l{Qt Multimedia Examples}
- \endlist
*/