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 /src/core/config | |
| parent | 3bb1294bc59320e5699840e14490197d6a77b7aa (diff) | |
| parent | e2609bcba621110920d847fcfbaf7edec4ae3827 (diff) | |
Merge branch '5.8' into dev
Conflicts:
configure.json
Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 83c852f86..59417997a 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -1,5 +1,6 @@ include(common.pri) -QT_FOR_CONFIG += gui-private +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += gui-private webengine-private # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. @@ -41,12 +42,12 @@ qtConfig(system-png): GYP_CONFIG += use_system_libpng=1 qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1 qtConfig(system-harfbuzz): use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 !qtConfig(glib): GYP_CONFIG += use_glib=0 -contains(QT_CONFIG, pulseaudio) { +qtConfig(pulseaudio) { GYP_CONFIG += use_pulseaudio=1 } else { GYP_CONFIG += use_pulseaudio=0 } -contains(QT_CONFIG, alsa) { +qtConfig(alsa) { GYP_CONFIG += use_alsa=1 } else { GYP_CONFIG += use_alsa=0 |