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

Fix Windows ICU build break in QCollator after commit c17563ec.

Browse Source 
It used LCID without including qt_windows.h while QT_USE_ICU was
defined.

Change-Id: I3d4cf0e6bd0e299729d23d9a36c5a87adde774c9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Michael Brüning 2014-09-16 13:50:19 +02:00 committed by Lars Knoll
parent a9d029974e
commit 16b72baf2e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qcollator_p.h
View File

@ -80,7 +80,7 @@ class Q_CORE_EXPORT QCollatorPrivate
public:
QAtomicInt ref;
QLocale locale;
#if defined(Q_OS_WIN)
#if defined(Q_OS_WIN) && !defined(QT_USE_ICU)
#ifdef USE_COMPARESTRINGEX
QString localeName;
#else