From 6f4779a7ac3dcfca23124f20bba6ab650e4a8a04 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 16 Jun 2009 15:45:33 +0200
Subject: Fixing QWidget support

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

diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index ccf12b0..be09190 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -193,7 +193,17 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledComp
                 }
                 if (!stack.isEmpty()) {
                     QObject *parent = stack.top();
-                    o->setParent(parent);
+                    if (o->isWidgetType()) { 
+                        QWidget *widget = static_cast<QWidget*>(o); 
+                        if (parent->isWidgetType()) { 
+                            QWidget *parentWidget = static_cast<QWidget*>(parent); 
+                            widget->setParent(parentWidget); 
+                        } else { 
+                            // TODO: parent might be a layout 
+                        } 
+                    } else { 
+                        o->setParent(parent); 
+                    } 
                 }
                 stack.push(o);
             }
-- 
cgit v0.12