From 14c7bb72b98ef39a9118ae0a8e48a3ccd58db07d Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Sun, 1 Apr 2012 20:31:55 +0200
Subject: Store the QMetaObject with the QMetaType.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will allow conversion between pointers to compatible QObject
derived types.

Change-Id: I19e08934571fb3f1b91e594892214041fe5f6a11
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---
 src/widgets/kernel/qwidgetsvariant.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/widgets')

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)
-- 
cgit v1.2.3