From e3555fe9705a44072a05b95cca36579745e14125 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 18 Nov 2016 13:32:19 +0100
Subject: Properly use QT_CONFIG macro to check for ICU

And remove the QT_USE_ICU define.

Change-Id: I8134ee18af7c90ed7070926ca31b3a57b3ec37dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/tools/qcollator_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/corelib/tools/qcollator_p.h')

diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index fbbce00676..423ba0325a 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -55,7 +55,7 @@
 #include <QtCore/private/qglobal_p.h>
 #include "qcollator.h"
 #include <QVector>
-#ifdef QT_USE_ICU
+#if QT_CONFIG(icu)
 #include <unicode/ucol.h>
 #elif defined(Q_OS_OSX)
 #include <CoreServices/CoreServices.h>
@@ -65,7 +65,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifdef QT_USE_ICU
+#if QT_CONFIG(icu)
 typedef UCollator *CollatorType;
 typedef QByteArray CollatorKeyType;
 
@@ -90,7 +90,7 @@ class Q_CORE_EXPORT QCollatorPrivate
 public:
     QAtomicInt ref;
     QLocale locale;
-#if defined(Q_OS_WIN) && !defined(QT_USE_ICU)
+#if defined(Q_OS_WIN) && !QT_CONFIG(icu)
 #ifdef USE_COMPARESTRINGEX
     QString localeName;
 #else
-- 
cgit v1.2.3