AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTypeInfoQuery: Add public inheritance specifiers

Browse Source 
Their absence offends PySide's shiboken.

Change-Id: I137d17e280276f7ffadba6d16b7c230a6880cf05
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
This commit is contained in:
Gabriel de Dietrich 2016-03-16 18:06:11 -07:00
parent 0307c008bf
commit c6bf48dcbf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qtypeinfo.h
View File

@ -111,14 +111,14 @@ public:
*/ */
// apply defaults for a generic QTypeInfo<T> that didn't provide the new values // apply defaults for a generic QTypeInfo<T> that didn't provide the new values
template <typename T, typename = void> template <typename T, typename = void>
struct QTypeInfoQuery : QTypeInfo<T> struct QTypeInfoQuery : public QTypeInfo<T>
{ {
enum { isRelocatable = !QTypeInfo<T>::isStatic }; enum { isRelocatable = !QTypeInfo<T>::isStatic };
}; };
// if QTypeInfo<T>::isRelocatable exists, use it // if QTypeInfo<T>::isRelocatable exists, use it
template <typename T> template <typename T>
struct QTypeInfoQuery<T, typename QtPrivate::QEnableIf<QTypeInfo<T>::isRelocatable || true>::Type> : QTypeInfo<T> struct QTypeInfoQuery<T, typename QtPrivate::QEnableIf<QTypeInfo<T>::isRelocatable || true>::Type> : public QTypeInfo<T>
{}; {};
/*! /*!