From bded052aad12514ba163ca8c7a73f241b3018a28 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 10 Apr 2014 12:34:42 +0200 Subject: Windows: Do not link QtCore against ICU by default Do not link against ICU on Windows, unless it is explicitly requested ('-icu' configure option). This removes the QtCore->ICU dependency if ICU was detected in the configure environment. So far ICU has been used in Qt Core for - support of a larger set of codecs (805 instead of 135) - more accurate QLocale functionality (QLocale::toUpper, qLocale::toLower) - string collation However, for all functionality there are also backends using the Windows API/Registry (QLocale, QCollator), or built-in codecs that are part of QtCore. Since the ICU dependency is quite heavy (3 libs with about 25 MB) it seems sensible to not require it by default. QtWebkit is unaffected, since it has it's own ICU check. [ChangeLog][Windows] Changed configure defaults so that Qt5Core does not link against ICU libraries anymore. Pass '-icu' to enable it. Task-number: QTBUG-38259 Change-Id: I3fd3e8ac0f091f532b04945718c0e4a3cc71a087 Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d149511218..a43737fdaf 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -258,7 +258,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "PCRE" ] = "auto"; - dictionary[ "ICU" ] = "auto"; + dictionary[ "ICU" ] = "no"; dictionary[ "ANGLE" ] = "auto"; dictionary[ "DYNAMICGL" ] = "auto"; -- cgit v1.2.3