From 000d98d826e7b85655456a66522812da338c3f72 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 18 Jun 2014 00:27:55 +0200
Subject: Bump version

Change-Id: I867c3b4aecc82095e65bd7f820e7fe6d14005705
---
 src/corelib/global/qglobal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/global/qglobal.h')

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 707e46dd40..d1aae1a681 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.3.1"
+#define QT_VERSION_STR   "5.3.2"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x050301
+#define QT_VERSION 0x050302
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
-- 
cgit v1.2.3


From d98004cd2f33e8147cff9f3cb203fdef5e6dd00e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 23 May 2014 18:32:32 +0200
Subject: fix QT_SUPPORTS macro with msvc2008

Change-Id: I70ffba51d2672574d7cefc3cb44724341cd86f22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qglobal.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global/qglobal.h')

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index d1aae1a681..f610cfab8c 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -59,7 +59,11 @@
 #include <QtCore/qconfig.h>
 #include <QtCore/qfeatures.h>
 #endif
-#define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
+#if defined(Q_CC_MSVC) && _MSC_VER <= 1500 /* VS2008 */
+#  define QT_SUPPORTS(FEATURE) (!defined QT_NO_##FEATURE)
+#else
+#  define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #  define QT_NO_UNSHARABLE_CONTAINERS
 #endif
-- 
cgit v1.2.3