diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:49:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:53:49 +0100 |
commit | 6189de6015764dd4a14774f2e08344c4cd085f69 (patch) | |
tree | aaadc8bf672ffde1d7bfa3080eeec416271a6c5c /src/webengine/doc/src/qtwebengine-features.qdoc | |
parent | ea2dafb7d07500e83b59fd708a9634a5e1135425 (diff) | |
parent | 6bb3d98e47d89790049edca796843345b8fd3c8b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc,
use the macro \macos.
Conflicts:
src/core/media_capture_devices_dispatcher.cpp
src/webengine/doc/src/qtwebengine-deploying.qdoc
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-features.qdoc')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index 52f7da928..62a09bb91 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -185,6 +185,7 @@ \li Linux \code /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so + /usr/lib/adobe-flashplugin/libpepflashplayer.so /usr/lib/PepperFlash/libpepflashplayer.so /usr/lib64/chromium/PepperFlash/libpepflashplayer.so \endcode |