diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-05 02:51:02 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-05 02:51:02 (GMT) |
| commit | 326dab74ba8df7707d1054ca5e0280c5f131c148 (patch) | |
| tree | 24b086094c9e26151f2dc68791689a41390755f0 /src | |
| parent | 3b3ec6bc4114db82462eef812a47db420d4505c2 (diff) | |
| download | Qt-326dab74ba8df7707d1054ca5e0280c5f131c148.zip Qt-326dab74ba8df7707d1054ca5e0280c5f131c148.tar.gz Qt-326dab74ba8df7707d1054ca5e0280c5f131c148.tar.bz2 | |
Null objects should appear as JS null
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp index 170f440..8b64e0e 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp @@ -104,7 +104,8 @@ QScriptValue QDeclarativeObjectScriptClass::newQObject(QObject *object, int type QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine); if (!object) - return newObject(scriptEngine, this, new ObjectData(object, type)); + return scriptEngine->nullValue(); +// return newObject(scriptEngine, this, new ObjectData(object, type)); if (QObjectPrivate::get(object)->wasDeleted) return scriptEngine->undefinedValue(); |