1 files changed, 46 insertions, 26 deletions

diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index 50e1a01f82..3f33956cb7 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -1,41 +1,33 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Copyright (C) 2013 Aleix Pol Gonzalez <aleixpol@kde.org>
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -43,12 +35,25 @@
 #ifndef QCOLLATOR_P_H
 #define QCOLLATOR_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qcollator.h"
 #include <QVector>
 #ifdef QT_USE_ICU
 #include <unicode/ucol.h>
 #elif defined(Q_OS_OSX)
 #include <CoreServices/CoreServices.h>
+#elif defined(Q_OS_WIN)
+#include <qt_windows.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -58,17 +63,16 @@ typedef UCollator *CollatorType;
 typedef QByteArray CollatorKeyType;
 
 #elif defined(Q_OS_OSX)
+typedef CollatorRef CollatorType;
 typedef QVector<UCCollationValue> CollatorKeyType;
 
-struct CollatorType {
-    CollatorType(int opt) : collator(NULL), options(opt) {}
-
-    CollatorRef collator;
-    UInt32 options;
-};
 #elif defined(Q_OS_WIN)
 typedef QString CollatorKeyType;
 typedef int CollatorType;
+#  ifdef Q_OS_WINRT
+#    define USE_COMPARESTRINGEX
+#  endif
+
 #else //posix
 typedef QVector<wchar_t> CollatorKeyType;
 typedef int CollatorType;
@@ -79,6 +83,17 @@ class Q_CORE_EXPORT QCollatorPrivate
 public:
     QAtomicInt ref;
     QLocale locale;
+#if defined(Q_OS_WIN) && !defined(QT_USE_ICU)
+#ifdef USE_COMPARESTRINGEX
+    QString localeName;
+#else
+    LCID localeID;
+#endif
+#endif
+    Qt::CaseSensitivity caseSensitivity;
+    bool numericMode;
+    bool ignorePunctuation;
+    bool dirty;
 
     CollatorType collator;
 
@@ -91,7 +106,12 @@ public:
     void cleanup();
 
     QCollatorPrivate()
-        : ref(1), collator(0)
+        : ref(1),
+          caseSensitivity(Qt::CaseSensitive),
+          numericMode(false),
+          ignorePunctuation(false),
+          dirty(true),
+          collator(0)
     { cleanup(); }
 
     ~QCollatorPrivate() { cleanup(); }