From 16b72baf2e7289ca284c5eff13ceb28b646fb470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Tue, 16 Sep 2014 13:50:19 +0200
Subject: [PATCH] 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>
---
 src/corelib/tools/qcollator_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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