diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:02 +0100 |
| commit | c8046f7d42b565e7fc02aa6228c72eee5ab51605 (patch) | |
| tree | eee9ea01acd97d156a9c3466251d3023feef9d82 /src/corelib/global/qglobal.h | |
| parent | ae56140b50bccde9e6cfdc6757f345c989ccd755 (diff) | |
| parent | ffac6ee2673a573a9db4f75a89c4c53251fa1304 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0b021b369725b73f09faa14b9da9e2431dc24fad
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index f5f144fe6b..8b91545c9b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -837,7 +837,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 */ |