From b4ef618b999eab335911a13d185d29e71f1ff5e2 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 17 Feb 2016 13:18:07 +0100 Subject: ICU: Sync use_system_icu and icu_use_data_file_flag If we use the system ICU we do not need to care about loading the data file. Task-number: QTBUG-51156 Change-Id: I9f9c61c39db50663105e99af001c7e9f56322717 Reviewed-by: Joerg Bornemann --- src/core/config/linux.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/config') diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 00e25ec58..88c1a41aa 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -40,6 +40,6 @@ use?(system_jsoncpp): GYP_CONFIG += use_system_jsoncpp=1 use?(system_opus): GYP_CONFIG += use_system_opus=1 use?(system_snappy): GYP_CONFIG += use_system_snappy=1 use?(system_vpx): GYP_CONFIG += use_system_libvpx=1 -use?(system_icu): GYP_CONFIG += use_system_icu=1 +use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0 use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 -- cgit v1.2.3 From 039e7622a3e8e99a5b8269d77d47af28365e20bf Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 19 Feb 2016 11:28:54 +0100 Subject: Revert "Disable using the ICU data file on embedded linux" This reverts commit c5957ac90cbaccccbd58b3fc73f94cf0d4795e54. It was based on the assumption that we remove system ICU, which got removed in commit 94b550ebee2858756a293aacf7e78e7ce11bb9c9. Task-number: QTBUG-51156 Change-Id: I7ac1adb414d250b2887af936ae3dc74a919a0890 Reviewed-by: Allan Sandfeld Jensen --- src/core/config/embedded_linux.pri | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core/config') diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 50f94147e..41891859d 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -35,7 +35,6 @@ GYP_CONFIG += \ use_libpci=0 \ use_ozone=1 \ use_system_fontconfig=1 \ - icu_use_data_file_flag=0 \ use_x11=0 \ v8_use_snapshot=false \ want_separate_host_toolset=1 \ -- cgit v1.2.3