diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:13:55 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:15:07 +0100 |
commit | d3dd527c3715188e2708ebcf5189076cbff9b104 (patch) | |
tree | 4a5c2a4e34d142c3a0cb690216a0d5df39708242 /tools/qmake/mkspecs/features/configure.prf | |
parent | 3bb1294bc59320e5699840e14490197d6a77b7aa (diff) | |
parent | e2609bcba621110920d847fcfbaf7edec4ae3827 (diff) |
Merge branch '5.8' into dev
Conflicts:
configure.json
Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
Diffstat (limited to 'tools/qmake/mkspecs/features/configure.prf')
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index bb4c56cae..43a5f2757 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -20,13 +20,20 @@ defineTest(runConfigure) { qtCompileTest($$test) } + isQtMinimum(5, 8) { + include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) + QT_FOR_CONFIG += webengine-private + qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs + qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker + } + linux { QT_FOR_CONFIG += gui-private !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") REQUIRED_PACKAGES = dbus-1 fontconfig !cross_compile: qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst - contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse + qtConfig(pulseaudio): REQUIRED_PACKAGES += libpulse qtConfig(system-png): REQUIRED_PACKAGES += libpng qtConfig(system-harfbuzz) { packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz @@ -81,12 +88,6 @@ defineTest(runConfigure) { !cross_compile { WEBENGINE_CONFIG += enable_pdf } - isQtMinimum(5, 8) { - include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) - QT_FOR_CONFIG += webengine-private - qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs - qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker - } isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) |