diff options
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | configure.json | 27 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 5 |
3 files changed, 33 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5ebfda16c..73dc70b08 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,7 @@ QMAKEPATH += $$PWD/tools/qmake # Resolve root directories for sources QTWEBENGINE_ROOT = $$PWD +QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean diff --git a/configure.json b/configure.json new file mode 100644 index 000000000..f9fa17a8d --- /dev/null +++ b/configure.json @@ -0,0 +1,27 @@ +{ + "module": "webengine", + + "commandline": { + "options": { + "proprietary-codecs": "boolean" + } + }, + + "features": { + "proprietary-codecs": { + "label": "Proprietary Codecs", + "autoDetect": false, + "purpose": "Enables the use of proprietary codecs such as h.264/h.265 and MP3", + "output": [ "privateFeature" ] + } + }, + + "summary": [ + { + "section": "Qt WebEngine", + "entries": [ + "proprietary-codecs" + ] + } + ] +} diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 675787bcf..105e3bc3c 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -75,6 +75,11 @@ defineTest(runConfigure) { else: log("System NSS not found, BoringSSL will be used.$${EOL}") } } + isQtMinimum(5, 8) { + include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) + QT_FOR_CONFIG += webengine-private + qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs + } isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) |