diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-11-05 22:51:39 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-11-05 22:51:39 (GMT) |
| commit | 4266b0616bb5d67244173dbe4d9d417dbf4d302f (patch) | |
| tree | 4d8320dfafe09657fb0e475bd6b36a50c4d79105 /src/declarative/qml/qmlengine.cpp | |
| parent | ec543f79c7d036961eb6cdcd956b3e8ca28b8e54 (diff) | |
| parent | 96f3abd4df881789bd2677100a2417c96fd2edb4 (diff) | |
| download | Qt-4266b0616bb5d67244173dbe4d9d417dbf4d302f.zip Qt-4266b0616bb5d67244173dbe4d9d417dbf4d302f.tar.gz Qt-4266b0616bb5d67244173dbe4d9d417dbf4d302f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 3df04b2..e46205d 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -626,6 +626,11 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi url = QUrl(ctxt->argument(2).toString()); QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1)); QmlContext *qmlCtxt = qmlContext(parentArg); + if(!parentArg || !qmlCtxt){ + //TODO: Could use a qmlInfo() like function for script functions + qWarning() << "createQmlObject called with invalid parent object"; + return engine->nullValue(); + } if (url.isEmpty()) { url = qmlCtxt->resolvedUrl(QUrl(QLatin1String("<Unknown File>"))); } else { |