diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-25 11:10:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-01 11:50:03 +0200 |
| commit | 9d5d883b8182b8e6cb46f0b305e57f701f818aa4 (patch) | |
| tree | d2bc3c05d8b95723aa603ac02ec608c491767c70 | |
| parent | 7cf83c03860536739c010c406e6a22e25d3444db (diff) | |
| download | qtwebengine-9d5d883b8182b8e6cb46f0b305e57f701f818aa4.tar.gz | |
Respect the system-png configure option
Link to system libpng on Linux if Qt was configured to do so.
Change-Id: Ic86120aabb206173738e5a1977cad1d762794f2a
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| -rw-r--r-- | src/core/config/desktop_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 679e5559c..803a5fe82 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -17,6 +17,7 @@ GYP_CONFIG += \ clang=0 \ enable_plugins=1 \ +contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 91b14003c..d902d8086 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -49,5 +49,6 @@ GYP_CONFIG += \ v8_use_snapshot=false \ want_separate_host_toolset=1 \ +contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 |