diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-10 14:11:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-10 13:16:37 +0000 |
| commit | 75d700204b3e0a7d66327afbf28e1869a062e397 (patch) | |
| tree | 5e8b549a82dfb37fd159ffd5ee6b1d6cb86f1ca1 /tools/qmake/mkspecs/features | |
| parent | bf6cffde943293674a063feda56f4564dd07414b (diff) | |
Start using new config system
Adds the optionproprietary codecs to configure.json, so it can be selected by
the global configure, and is summarized there too.
Keeps the old system for compat with building against older Qt.
Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tools/qmake/mkspecs/features')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 5 |
1 files changed, 5 insertions, 0 deletions
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)) |