diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-05-19 18:43:59 +1000 |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2011-05-19 18:43:59 +1000 |
commit | 56d80e1590877e9f6cb9de0e7a0194519fb5813c (patch) | |
tree | ac9b4595d7d78d65ea55510652bbb6cb0c8153c3 /src/declarative/qml/qdeclarativeengine.cpp | |
parent | 29017e818e2744f9d8f3b330e94f85bc7f72af38 (diff) | |
parent | 13970487ff78c2794fa2300af33b536968162953 (diff) |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 86b7e9412f..073e1d4119 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1740,9 +1740,6 @@ QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine qsreal w = ctxt->argument(2).toNumber(); qsreal h = ctxt->argument(3).toNumber(); - if (w < 0 || h < 0) - return engine->nullValue(); - return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(QVariant::fromValue(QRectF(x, y, w, h))); } |