summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2016-02-17 13:18:07 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2016-03-01 13:13:09 +0000
commitb4ef618b999eab335911a13d185d29e71f1ff5e2 (patch)
treed1ffb4f2be21b7cc7fe67ec396c907b585f82683 /src
parentd6c32fa215080ad8094c699f40e1823d3ca2a14c (diff)
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 <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/config/linux.pri2
1 files changed, 1 insertions, 1 deletions
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