AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading of the ICU dynamic libraries on Windows.

Browse Source 
- Account for differing library name on Windows.
- Improve error messages.

Acked-by: John Layt <jlayt@kde.org>

Change-Id: Ib567f8c79ab4b5655cdb2fe050f91013e9305263
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-03-22 15:01:50 +01:00 committed by Qt by Nokia
parent 5e9089135b
commit 7efda762da
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/corelib/tools/qlocale_icu.cpp
View File

@ -81,9 +81,19 @@ bool qt_initIcu(const QString &localeString)
if (status == NotLoaded) { if (status == NotLoaded) {
// resolve libicui18n // resolve libicui18n
QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); const QString version = QString::fromLatin1(U_ICU_VERSION_SHORT);
#ifdef Q_OS_WIN
// QLibrary on Windows does not use the version number, the libraries
// are named "icuin<version>.dll", though.
QString libName = QStringLiteral("icuin") + version;
#else
QString libName = QStringLiteral("icui18n");
#endif
QLibrary lib(libName, version);
if (!lib.load()) { if (!lib.load()) {
qWarning() << "Unable to load library icui18n" << lib.errorString(); qWarning("Unable to load library '%s' version %s: %s",
qPrintable(libName), qPrintable(version),
qPrintable(lib.errorString()));
status = ErrorLoading; status = ErrorLoading;
return false; return false;
} }
@ -104,15 +114,22 @@ bool qt_initIcu(const QString &localeString)
ptr_ucol_close = 0; ptr_ucol_close = 0;
ptr_ucol_strcoll = 0; ptr_ucol_strcoll = 0;
qWarning("Unable to find symbols in icui18n"); qWarning("Unable to find symbols in '%s'.", qPrintable(libName));
status = ErrorLoading; status = ErrorLoading;
return false; return false;
} }
// resolve libicuuc // resolve libicuuc
QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); #ifdef Q_OS_WIN
libName = QStringLiteral("icuuc") + version;
#else
libName = QStringLiteral("icuuc");
#endif
QLibrary ucLib(libName, version);
if (!ucLib.load()) { if (!ucLib.load()) {
qWarning() << "Unable to load library icuuc" << ucLib.errorString(); qWarning("Unable to load library '%s' version %s: %s",
qPrintable(libName), qPrintable(version),
qPrintable(ucLib.errorString()));
status = ErrorLoading; status = ErrorLoading;
return false; return false;
} }
@ -129,7 +146,7 @@ bool qt_initIcu(const QString &localeString)
ptr_u_strToUpper = 0; ptr_u_strToUpper = 0;
ptr_u_strToLower = 0; ptr_u_strToLower = 0;
qWarning("Unable to find symbols in icuuc"); qWarning("Unable to find symbols in '%s'", qPrintable(libName));
status = ErrorLoading; status = ErrorLoading;
return false; return false;
} }