diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-14 15:21:28 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-15 07:01:39 +0000 |
| commit | b9d0b6933875005a5b1f17a53e29240faf4a440e (patch) | |
| tree | f57a4b96f2dc67411413bd336141f5dd02752bad /src/core/config | |
| parent | 42cd3124cdef38545fdba5a2de37bfcad2542cad (diff) | |
Fix Linux audio library detection
The configure checks where moved to QtMultimedia which we do not depend
on, therefore we need to now duplicate the checks ourselves.
Task-number: QTBUG-57620
Change-Id: I6f7319c7e91e3f51baf012c669121389cd6e1360
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
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 |