summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-12-24 21:28:30 -0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-03 17:56:14 +0100
commit84fd0afacbddc8675d20fb2c3b50da4a1520553f (patch)
tree08443cda4ecc7f85e1683663a42be2476e075caa /src/corelib/global/qglobal.h
parent2c65b78b400ec27e6e559829b9a970dca2df6669 (diff)
Remove disabling of warning 4660 on MSVC
This warning no longer exists since at least MSVC.NET 2003. It's reported to have existed on MSVC 6 and older only. Task-number: QTBUG-35815 Change-Id: Ifb35d027edc3c1cbadac9a0d0a9c26524c52c87f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 9e2dce6d8c..6ec244dbee 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -827,7 +827,6 @@ Q_CORE_EXPORT void qFreeAligned(void *ptr);
# pragma warning(disable: 4097) /* typedef-name 'identifier1' used as synonym for class-name 'identifier2' */
# pragma warning(disable: 4706) /* assignment within conditional expression */
# pragma warning(disable: 4786) /* truncating debug info after 255 characters */
-# pragma warning(disable: 4660) /* template-class specialization 'identifier' is already instantiated */
# pragma warning(disable: 4355) /* 'this' : used in base member initializer list */
# pragma warning(disable: 4231) /* nonstandard extension used : 'extern' before template explicit instantiation */
# pragma warning(disable: 4710) /* function not inlined */