Bump Qt version to 5.4.0

Change-Id: I9eea1d2e383aff7eec4817b17c098a6fcc03e041
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

src/corelib/global/qglobal.h

@@ -45,11 +45,11 @@
 
 #include <stddef.h>
 
-#define QT_VERSION_STR   "5.3.0"
+#define QT_VERSION_STR   "5.4.0"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x050300
+#define QT_VERSION 0x050400
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */

src/corelib/io/qdatastream.cpp

@@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
         return retVal;
 
 enum {
-    DefaultStreamVersion = QDataStream::Qt_5_3
+    DefaultStreamVersion = QDataStream::Qt_5_4
 };
 
 /*!
@@ -542,6 +542,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \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
+    \value Qt_5_4 Same as Qt_5_2
 
     \sa setVersion(), version()
 */

src/corelib/io/qdatastream.h

@@ -88,8 +88,9 @@ public:
         Qt_5_0 = 13,
         Qt_5_1 = 14,
         Qt_5_2 = 15,
-        Qt_5_3 = Qt_5_2
-#if QT_VERSION >= 0x050400
+        Qt_5_3 = Qt_5_2,
+        Qt_5_4 = Qt_5_3
+#if QT_VERSION >= 0x050500
 #error Add the datastream version for this Qt version
 #endif
     };