diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-11 10:25:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-11 10:25:38 +0000 |
| commit | c305cc06c74cb95ef2ddfacee0ede1d82e3dbb3c (patch) | |
| tree | e09e2ccbc9bda8f46737c89e8b2297061d6daade /src/core/config/linux.pri | |
| parent | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (diff) | |
| parent | ccf12049b662fe1b03b5b0ea199d29b32f072eda (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index ac476a110..7d6c7bfbc 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -43,6 +43,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 use?(system_protobuf): GYP_CONFIG += use_system_protobuf=1 |