summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-06-19 12:30:32 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-07-07 03:51:41 +0200
commit11c30f9705e796ebabcdd868bce3ad3664cc06eb (patch)
treec7c95ff9c74dd41c2168fb51306af077a8a3daea /src/corelib
parent1d111091b5906bd9067d8c8510fc9a7fc2af10aa (diff)
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 <martin.smith@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qcompilerdetection.h12
1 files changed, 0 insertions, 12 deletions
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
@@ -1016,18 +1016,6 @@
#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
*/
#ifndef QT_NO_KEYWORDS