summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-02-09 13:11:26 -0800
committerThiago Macieira <thiago.macieira@intel.com>2017-02-09 21:23:31 +0000
commit8a410f60ae39b06555d807581caf7cb8bfab4fac (patch)
treea01b36c7faec8acbcfc2ee00ad82a994a1a74a1e /src/corelib
parent7314c53d31662ba2e13154f757ecc463d79bc5a8 (diff)
Don't include qfloat.h in the QtCore master include
We have observed that MSVC 2013 gets lost with the overloads that this header adds, causing compilation bugs. This is believed to be a compiler bug, but it's not something we can work around. Task-number: QTBUG-58555 Change-Id: I536c32a88bff44dab37afffd14a1bad1d31dc16d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Glen Mabey <Glen.Mabey@swri.org>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qfloat16.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index 5059108fb8..67c062d349 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
#if 0
#pragma qt_class(QFloat16)
+#pragma qt_no_master_include
#endif
class qfloat16