summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-12 07:40:30 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-12 07:40:30 (GMT)
commitc7e351aa2f899aed619b896c627606ea24384321 (patch)
treea2be74e0ea432f45d3d611326ff2dce207f61902
parent893404a0ad649ba12d3ada2e94cc17cf77b96127 (diff)
downloadQt-c7e351aa2f899aed619b896c627606ea24384321.zip
Qt-c7e351aa2f899aed619b896c627606ea24384321.tar.gz
Qt-c7e351aa2f899aed619b896c627606ea24384321.tar.bz2
Remove QWidget hack
We no longer have any QWidget bindings, so we don't need this hack. Will have to solve the problem properly when we reintroduce QWidget support.
-rw-r--r--src/declarative/qml/qmlvme.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 794c836..dc9ef06 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -282,11 +282,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
}
if (!stack.isEmpty()) {
QObject *parent = stack.top();
- if (o->isWidgetType()) {
- qobject_cast<QWidget*>(o)->setParent(qobject_cast<QWidget*>(parent));
- } else {
- o->setParent(parent);
- }
+ o->setParent(parent);
}
stack.push(o);
}