diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-12-19 00:18:07 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2014-12-19 09:15:30 +0100 |
| commit | 7393bb0af4c98cabef3138e4db60692e70d4c444 (patch) | |
| tree | 078d752241f3bdb4a941c03f226645a23651cb08 /src/corelib/kernel/qmetatype.h | |
| parent | 7869ee5b9d74a9bcf1cff097fb93b108146f4df8 (diff) | |
MSVC: Restore 'public' accessibility of QMetaType member functions
They were made 'private' as a side effect of a change enabling
support of template friends for MSVC. However, accessibility
is part of the MSVC's name mangling and thus BC was broken.
[ChangeLog][Important Behavior Changes] Restored binary
compatibility with Qt 5.3.2 on Windows when using MSVC 2012 or
MSVC 2013. This means that Qt 5.4.1 is no longer binary compatible
with Qt 5.4.0 when using either of those compilers.
Change-Id: I18679aa15821a7365606dc80fdc8411641573820
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index af38589903..7a45e21253 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -640,7 +640,7 @@ private: static bool registerDebugStreamOperatorFunction(const QtPrivate::AbstractDebugStreamFunction *f, int type); #endif -#ifndef Q_NO_TEMPLATE_FRIENDS +#if !defined(Q_NO_TEMPLATE_FRIENDS) && !defined(Q_CC_MSVC) #ifndef Q_QDOC template<typename T> friend bool qRegisterSequentialConverter(); |