projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
[profile/ivi/qtdeclarative.git]
/
src
/
declarative
/
qml
/
qdeclarativeengine.cpp
diff --git
a/src/declarative/qml/qdeclarativeengine.cpp
b/src/declarative/qml/qdeclarativeengine.cpp
index
86b7e94
..
073e1d4
100644
(file)
--- 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)));
}