diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2016-03-16 18:06:11 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2016-03-17 16:54:53 +0000 |
| commit | c6bf48dcbfd6b1048cddfd127b95dce27815709f (patch) | |
| tree | 2873186ef36f06a7326d9fe7df1d16d55904963d /src/corelib/global/qtypeinfo.h | |
| parent | 0307c008bf71e1272385d0e7f7c8d2c5a1ba6526 (diff) | |
QTypeInfoQuery: Add public inheritance specifiers
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>
Diffstat (limited to 'src/corelib/global/qtypeinfo.h')
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index b42e5998fc..f5fc311a22 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -111,14 +111,14 @@ public: */ // apply defaults for a generic QTypeInfo<T> that didn't provide the new values template <typename T, typename = void> -struct QTypeInfoQuery : QTypeInfo<T> +struct QTypeInfoQuery : public QTypeInfo<T> { enum { isRelocatable = !QTypeInfo<T>::isStatic }; }; // if QTypeInfo<T>::isRelocatable exists, use it 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> {}; /*! |