summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-05-23 18:32:32 +0200
committerThiago Macieira <thiago.macieira@intel.com>2014-06-20 21:21:43 +0200
commitd98004cd2f33e8147cff9f3cb203fdef5e6dd00e (patch)
treec95b674cc6cc0c161a89a3a95ad2e5a1d8073e0e
parent443f06a2ec1b1ba7da3d64151c6e92a3c77deadf (diff)
fix QT_SUPPORTS macro with msvc2008
Change-Id: I70ffba51d2672574d7cefc3cb44724341cd86f22 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/global/qglobal.h6
1 files changed, 5 insertions, 1 deletions
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