diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:40:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:45:46 +0200 |
| commit | b3f7d3a62e00e611e8d7f592ae048a9536b635c6 (patch) | |
| tree | e88ce4289a42dbfcc828fab1f96dbabbf1572725 /src/core/config | |
| parent | c0d5f7e6c10e56777b025b83a1fc53c610927714 (diff) | |
| parent | 80a2497207b3824852578df63b30d8af4ee800a3 (diff) | |
Merge Chromium 44 and fixes
Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch,
which contains all the patches to build against Chromium 44.
Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/desktop_linux.pri | 3 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 679e5559c..2ebd6b995 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -17,6 +17,9 @@ GYP_CONFIG += \ clang=0 \ enable_plugins=1 \ +config_system_libxslt: GYP_CONFIG += use_system_libxml=1 +contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=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 cc8c40f8e..5ab0409e8 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -50,5 +50,8 @@ GYP_CONFIG += \ v8_use_snapshot=false \ want_separate_host_toolset=1 \ +config_system_libxslt: GYP_CONFIG += use_system_libxml=1 +contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=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 |