diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-14 14:03:53 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-27 12:31:47 +0000 |
commit | 94b550ebee2858756a293aacf7e78e7ce11bb9c9 (patch) | |
tree | 9d277093ee65674368590fba9e2f716c99976837 /src | |
parent | 8b6bd564eddafe9b3fd42e19367c0f94e860ceed (diff) |
Add post configure step and make using system ICU an option
Adds a post configure step to test qmake arguments, summerize
options, and make it possible to enable using system ICU, but
leaving it default off for now. Also summerizes the proprietary
codec configuration.
Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/config/desktop_linux.pri | 2 | ||||
-rw-r--r-- | src/core/config/embedded_linux.pri | 3 | ||||
-rw-r--r-- | src/core/gyp_run.pro | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index d9ce4f721..fc965f363 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -30,4 +30,6 @@ config_system_opus: GYP_CONFIG += use_system_opus=1 config_system_speex: GYP_CONFIG += use_system_speex=1 config_system_vpx: GYP_CONFIG += use_system_libvpx=1 +contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=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 b645caa90..ffe530bc9 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -43,7 +43,6 @@ GYP_CONFIG += \ use_ozone=1 \ use_pango=0 \ use_system_fontconfig=1 \ - use_system_icu=1 \ icu_use_data_file_flag=0 \ use_x11=0 \ v8_use_snapshot=false \ @@ -62,3 +61,5 @@ config_system_jsoncpp: GYP_CONFIG += use_system_jsoncpp=1 config_system_opus: GYP_CONFIG += use_system_opus=1 config_system_speex: GYP_CONFIG += use_system_speex=1 config_system_vpx: GYP_CONFIG += use_system_libvpx=1 + +contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1 diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 3f631302c..bb19a679d 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -85,7 +85,7 @@ cross_compile { contains(QT_ARCH, "x86_64"): GYP_ARGS += "-D target_arch=x64" contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32" -contains(WEBENGINE_CONFIG, proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0" +contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0" !contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { GYP_ARGS += "-D qt_install_data=\"$$[QT_INSTALL_DATA/get]\"" |