From 4b4c852c2e5c360f19d1656ba4ac077764931ac1 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 6 May 2009 11:37:12 +0200
Subject: Add some support for QWidget (again)

QObject::setParent is not allowed for QWidgets
using QWidget::setParent instead if QObject::isWidgetType()

Reviewed-by: Kai Koehne
---
 src/declarative/qml/qmlvme.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 82df3bc..ca4f9c9 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -48,6 +48,7 @@
 #include <private/qmlcustomparser_p.h>
 #include <qperformancelog.h>
 #include <QStack>
+#include <QWidget>
 #include <private/qmlcompiledcomponent_p.h>
 #include <QColor>
 #include <QPointF>
@@ -274,7 +275,11 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
                 }
                 if (!stack.isEmpty()) {
                     QObject *parent = stack.top();
-                    o->setParent(parent);
+                    if (o->isWidgetType()) {
+                        qobject_cast<QWidget*>(o)->setParent(qobject_cast<QWidget*>(parent));
+                    } else {
+                        o->setParent(parent);
+                    }
                 }
                 stack.push(o);
             }
-- 
cgit v0.12