diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-28 17:07:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-29 11:17:27 +0200 |
| commit | 391a6322511bb189b7d7cc094e34a34ae6495820 (patch) | |
| tree | 8eaedb5d053575e7f2eddd0a6cb0f0e6ae0d6cab /src/webengine | |
| parent | af313cb881610fedb04c9d486597462e6b3c8e12 (diff) | |
| parent | 1b1411c589cb7ed29916762bcfedbbb68e657d2f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9b1f2a0317290f0855da03eca9d26878b7faeb0a
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. |