diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-09-16 13:50:19 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2014-09-16 14:12:32 +0200 |
| commit | 16b72baf2e7289ca284c5eff13ceb28b646fb470 (patch) | |
| tree | 1e4fa614b136574b14e7ed29acab022fd00f59e2 | |
| parent | a9d029974ea27417f9c75a6cd6d4f1d4434635f0 (diff) | |
Fix Windows ICU build break in QCollator after commit c17563ec.
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>
| -rw-r--r-- | src/corelib/tools/qcollator_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index c303cfbcff..00b6ce7290 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -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 |