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>
This commit is contained in:
parent
7869ee5b9d
commit
7393bb0af4
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user