summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2012-07-19 09:38:22 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-27 16:07:01 (GMT)
commitcf08691d5748ea1e2fe77d4bada5b324678169a6 (patch)
treeb1cb22b608501a18c57c6d10e9de6659efc598f4 /src/corelib
parent2f4093332db6c9057b82f9c5fababc9bc6cbeb32 (diff)
downloadQt-cf08691d5748ea1e2fe77d4bada5b324678169a6.zip
Qt-cf08691d5748ea1e2fe77d4bada5b324678169a6.tar.gz
Qt-cf08691d5748ea1e2fe77d4bada5b324678169a6.tar.bz2
Use improved QLibrary search heuristics for ICU in QLocale
Change-Id: Ia39350adbc43ded4faa06885e00eead45261f87f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qlocale_icu.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
index 0e220ff..8ee2160 100644
--- a/src/corelib/tools/qlocale_icu.cpp
+++ b/src/corelib/tools/qlocale_icu.cpp
@@ -82,6 +82,7 @@ bool qt_initIcu(const QString &localeString)
// resolve libicui18n
QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+ lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!lib.load()) {
qWarning() << "Unable to load library icui18n" << lib.errorString();
status = ErrorLoading;
@@ -111,6 +112,7 @@ bool qt_initIcu(const QString &localeString)
// resolve libicuuc
QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+ ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!ucLib.load()) {
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
status = ErrorLoading;