diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-05-30 20:10:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-05-30 20:10:14 +0000 |
| commit | 3bef9a742b48ed9b72877c346b7bdf6bbe03eb8c (patch) | |
| tree | 4c76ca67f27bb0fd8024060a0dadf1f6a5310831 /src/webengine | |
| parent | 6e28e764d7c425f942820f0881231eb83e553e6e (diff) | |
| parent | 391a6322511bb189b7d7cc094e34a34ae6495820 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index 96b5072ee..d900e551b 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -56,12 +56,29 @@ Qt WebEngine supports the MPEG-4 Part 14 (MP4) file format only if the required proprietary audio and video codecs, such as H.264 and MPEG layer-3 (MP3), have been enabled. Proprietary codecs can be enabled by passing the - following option when configuring Qt: + following option to the \c configure tool when configuring Qt: \code -webengine-proprietary-codecs \endcode + For example, the following option could be passed when configuring Qt for + building it at the top level: + + \code + configure -webengine-proprietary-codecs + \endcode + + For more information, see \l{Qt Configure Options}. + + When using qmake to build just the Qt WebEngine module, the following + command can be used (in this example, the Qt WebEngine source code is + located in \c {C:\qt\qtwebengine}): + + \code + qmake C:\qt\qtwebengine -- -webengine-proprietary-codecs + \endcode + \warning When distributing proprietary codec libraries, you must acquire licenses for them. |