summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-03-04 11:40:39 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-03-04 11:16:00 +0000
commit1109e4ef5f11f961ad28c018551693d92dde96f7 (patch)
tree4f8c9cba2c75cdb040a666e2871c725856fb50f8
parent93defd83fd7d0c1fd647601ac99b426712f829bb (diff)
Respect use-system-jpeg Qt setting
Forward the system-jpeg Qt setting to chromium. Change-Id: I646176fdf6a1c7818828dc8b24543cc885cc3688 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-rw-r--r--src/core/config/desktop_linux.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index 500e04448..041b094a1 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -16,4 +16,6 @@ GYP_CONFIG += \
host_clang=0 \
clang=0 \
+contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+
!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0