diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
| commit | 8a164aa2cd83d728ce620c2b7199ebc6222b55cb (patch) | |
| tree | e63e01795baafd41e2a65641d21eb00469bed0c5 /config_help.txt | |
| parent | 5480a26d2f16dacfbce47da337559b5bcfb3d45e (diff) | |
| parent | f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/core/web_event_factory.cpp
src/core/web_event_factory.h
src/webengine/render_widget_host_view_qt_delegate_quick.h
Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/config_help.txt b/config_help.txt index 6ff24f8c8..8055de910 100644 --- a/config_help.txt +++ b/config_help.txt @@ -1,13 +1,23 @@ Webengine options: - - -alsa ................ Enable ALSA support [auto] (Linux only) - -webengine-icu ....... Select used ICU libraries [system/qt] (Linux only) - -ffmpeg .............. Select used FFmpeg libraries [system/qt] (Linux only) - -opus ................ Select used Opus libraries [system/qt] (Linux only) - -webp ................ Select used WebP libraries [system/qt] (Linux only) - -pepper-plugins ...... Enable use of Pepper Flash and Widevine plugins [auto] - -printing-and-pdf .... Enable use of printing and output to PDF [auto] - -proprietary-codecs .. Enable support for proprietary codecs [no] - -pulseaudio .......... Enable PulseAudio support [auto] (Linux only) - -spellchecker ........ Enable support for spellchecker [yes] - -webrtc .............. Enable support for WebRTC [auto] + -webengine-alsa ................ Enable ALSA support [auto] (Linux only) + -webengine-pulseaudio .......... Enable PulseAudio support [auto] + (Linux only) + -webengine-embedded-build ...... Enable Linux embedded build [auto] + (Linux only) + -webengine-icu ................. Use system ICU libraries [system/qt] + (Linux only) + -webengine-ffmpeg .............. Use system FFmpeg libraries [system/qt] + (Linux only) + -webengine-opus ................ Use system Opus libraries [system/qt] + (Linux only) + -webengine-webp ................ Use system WebP libraries [system/qt] + (Linux only) + -webengine-pepper-plugins ...... Enable use of Pepper Flash and Widevine + plugins [auto] + -webengine-printing-and-pdf .... Enable use of printing and output to PDF + [auto] + -webengine-proprietary-codecs .. Enable support for proprietary codecs [no] + -webengine-spellchecker ........ Enable support for spellchecker [yes] + -webengine-native-spellchecker . Enable support for native spellchecker [no] + (macOS only) + -webengine-webrtc .............. Enable support for WebRTC [auto] |