diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-04-01 20:31:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-01 15:07:10 +0200 |
| commit | 14c7bb72b98ef39a9118ae0a8e48a3ccd58db07d (patch) | |
| tree | c764b32a9106419310f2f89618936ba2f3825b90 /src/widgets | |
| parent | 2988c44f7675ba3c4a4b28690db467ba0e40469d (diff) | |
Store the QMetaObject with the QMetaType.
This will allow conversion between pointers to compatible QObject
derived types.
Change-Id: I19e08934571fb3f1b91e594892214041fe5f6a11
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index da75536cb9..0e4d44bc97 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -42,6 +42,7 @@ #include "qvariant.h" #include "qsizepolicy.h" +#include "qwidget.h" #include "private/qvariant_p.h" #include <private/qmetatype_p.h> @@ -151,10 +152,12 @@ static const QMetaTypeInterface qVariantWidgetsHelper[] = { } // namespace extern Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper; +extern Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper; void qRegisterWidgetsVariant() { qMetaTypeWidgetsHelper = qVariantWidgetsHelper; + qMetaObjectWidgetsHelper = &QWidget::staticMetaObject; QVariantPrivate::registerHandler(QModulesPrivate::Widgets, &widgets_handler); } Q_CONSTRUCTOR_FUNCTION(qRegisterWidgetsVariant) |