diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:31 +0200 |
commit | e6c64fa060906997af46d42f8ce768be9449534d (patch) | |
tree | 0170d8ab4f26b686263ea8a5a0ee1f6b540628cd /src/webengine/doc/src/qtwebengine-platform-notes.qdoc | |
parent | 42a422ff035d51f5a20e7b0024ea30e764b92097 (diff) | |
parent | 8575d9aa489f4c9e839e3cb28b9f8c27acbdb425 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-platform-notes.qdoc')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index c5f373029..dec9d0407 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -134,7 +134,7 @@ codecs can be enabled by passing the following option to qmake: \code - qmake WEBENGINE_CONFIG += use_proprietary_codecs + qmake WEBENGINE_CONFIG+=use_proprietary_codecs \endcode \warning When distributing proprietary codec libraries, you must acquire licenses for them. |