From 11c30f9705e796ebabcdd868bce3ad3664cc06eb Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Jun 2014 12:30:32 -0700 Subject: Remove QT_STATIC_CONST This macro is no longer used. It was introduced probably by mistake, due to MSVC not following the strict string requirement of the C and C++ standards by default (you can assign a string literal to a non-const char*). Change-Id: I4b221dd435191b0eea689dbed35915cf3206648b Reviewed-by: Martin Smith Reviewed-by: Friedemann Kleint --- src/corelib/global/qcompilerdetection.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 7498c778a8..0f9a821e40 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1015,18 +1015,6 @@ # define Q_DECL_CONST_FUNCTION Q_DECL_PURE_FUNCTION #endif -/* - Workaround for static const members on MSVC++. -*/ - -#if defined(Q_CC_MSVC) -# define QT_STATIC_CONST static -# define QT_STATIC_CONST_IMPL -#else -# define QT_STATIC_CONST static const -# define QT_STATIC_CONST_IMPL const -#endif - /* Proper for-scoping in MIPSpro CC */ -- cgit v1.2.3