From 7c35824e6b855d134f51d46a0da8aaa900cd0b2e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 22 Sep 2013 19:39:39 -0700
Subject: [PATCH] Bump Qt version to 5.3.0

Change-Id: Id15c3bcc4bced847a11eec08fcffda5100d778ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
---
 src/corelib/global/qglobal.h   | 4 ++--
 src/corelib/io/qdatastream.cpp | 3 ++-
 src/corelib/io/qdatastream.h   | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index b1a22ddf03..0f124e0ccd 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -45,11 +45,11 @@
 
 #include <stddef.h>
 
-#define QT_VERSION_STR   "5.2.0"
+#define QT_VERSION_STR   "5.3.0"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x050200
+#define QT_VERSION 0x050300
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 008460df5d..614ac97f2f 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
         return retVal;
 
 enum {
-    DefaultStreamVersion = QDataStream::Qt_5_2
+    DefaultStreamVersion = QDataStream::Qt_5_3
 };
 
 /*!
@@ -541,6 +541,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \value Qt_5_0 Version 13 (Qt 5.0)
     \value Qt_5_1 Version 14 (Qt 5.1)
     \value Qt_5_2 Version 15 (Qt 5.2)
+    \value Qt_5_3 Same as Qt_5_2
 
     \sa setVersion(), version()
 */
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index f107e801b6..28f1d51a12 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -87,8 +87,9 @@ public:
         Qt_4_9 = Qt_4_8,
         Qt_5_0 = 13,
         Qt_5_1 = 14,
-        Qt_5_2 = 15
-#if QT_VERSION >= 0x050300
+        Qt_5_2 = 15,
+        Qt_5_3 = Qt_5_2
+#if QT_VERSION >= 0x050400
 #error Add the datastream version for this Qt version
 #endif
     };