diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 14:50:22 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 16:56:24 +0100 |
| commit | 7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch) | |
| tree | 4331533a6c0fa7a843c831d66e62472a7f8a4d30 /src/core/configure.json | |
| parent | 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff) | |
| parent | f17f815878d1d3f02f464347d2807555cab00a88 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 755a525a8..f111247e4 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -20,6 +20,7 @@ "webengine-pulseaudio": "boolean", "webengine-spellchecker": "boolean", "webengine-native-spellchecker": "boolean", + "webengine-extensions": "boolean", "webengine-webrtc": "boolean", "webengine-geolocation": "boolean", "webengine-v8-snapshot": "boolean", @@ -36,6 +37,7 @@ "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" }, "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" }, "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" }, + "extensions": { "type": "boolean", "name": "webengine-extensions" }, "webrtc": { "type": "boolean", "name": "webengine-webrtc" } } }, @@ -328,6 +330,10 @@ "webengine-arm-thumb" : { "label": "thumb instruction set", "type": "hasThumbFlag" + }, + "webengine-extensions-gcc-version" : { + "label": "GCC 6 or newer", + "type": "hasGcc6OrNewer" } }, @@ -548,6 +554,14 @@ "condition": "config.macos && features.webengine-spellchecker", "output": [ "publicFeature" ] }, + "webengine-extensions": { + "label": "Extensions", + "purpose": "Enables Chromium extensions within certain limits. Currently used for enabling the pdf viewer.", + "section": "WebEngine", + "condition": "features.webengine-printing-and-pdf && (tests.webengine-extensions-gcc-version || config.clang || !config.gcc)", + "autoDetect": "features.webengine-printing-and-pdf", + "output": [ "publicFeature" ] + }, "webengine-webrtc": { "label": "WebRTC", "purpose": "Provides WebRTC support.", @@ -727,6 +741,7 @@ "webengine-webchannel", "webengine-v8-snapshot", "webengine-kerberos", + "webengine-extensions", { "type": "feature", "args": "webengine-v8-snapshot-support", |