diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
| commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
| tree | f9cb367d6e66067970102ed1864f7280f3750ccc /src/webengine/doc | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'src/webengine/doc')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index 7850ff35d..545d230ef 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -55,10 +55,10 @@ 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 to qmake when building Qt WebEngine: + following option when configuring Qt: \code - qmake WEBENGINE_CONFIG+=use_proprietary_codecs + -proprietary-codecs \endcode \warning When distributing proprietary codec libraries, you must acquire |