diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-01-04 09:25:12 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-01-04 09:26:16 (GMT) |
| commit | 186cdd1c29f1c708455ec2f0771a6eb600d4a075 (patch) | |
| tree | b9d81f758f1e42f4bbc632f3caf004d0da843410 | |
| parent | d280dcda3fc8ec2ae99641c95bc64823652b9f86 (diff) | |
| download | Qt-186cdd1c29f1c708455ec2f0771a6eb600d4a075.zip Qt-186cdd1c29f1c708455ec2f0771a6eb600d4a075.tar.gz Qt-186cdd1c29f1c708455ec2f0771a6eb600d4a075.tar.bz2 | |
Revert "Maybe fix QTBUG-5690"
This reverts commit 40477f47685a2745cb591bde5669338a4a0a70eb.
Need to clarify the issue a bit further first.
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 8c32fa4..2d53b0b 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -528,8 +528,7 @@ QmlComponent::QmlComponent(QmlComponentPrivate &dd, QObject *parent) QScriptValue QmlComponent::createObject() { Q_D(QmlComponent); - //QmlContext* ctxt = creationContext(); - QmlContext* ctxt = d->engine->rootContext();//Fixes QTBUG-5690, but is it the right fix? + QmlContext* ctxt = creationContext(); if(!ctxt){ qWarning() << QLatin1String("createObject can only be used in QML"); return QScriptValue(); |