diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-05-08 01:05:53 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-05-08 01:05:53 (GMT) |
commit | 4981d87a31090682acb28dccc7f6672f8e32ca61 (patch) | |
tree | 097e979a106161f0943a01ab34fdfdd905d972d3 /src | |
parent | 6b1da53ad4ee4fa9bd60c8c039ba18d386c5e1ad (diff) | |
parent | bc20e3e0325f0f3395a6a2012cd263a724576ba1 (diff) | |
download | Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.zip Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.tar.gz Qt-4981d87a31090682acb28dccc7f6672f8e32ca61.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/canvas/qsimplecanvas_graphicsview.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/script/qmlbasicscript.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/script/qmlbasicscript_p.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp index dd4012b..5c6f2f5 100644 --- a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp +++ b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp @@ -110,7 +110,6 @@ void QSimpleGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) p = p->parent(); } owner->mouseReleaseEvent(event); - ungrabMouse(); } void QSimpleGraphicsItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) diff --git a/src/declarative/qml/script/qmlbasicscript.cpp b/src/declarative/qml/script/qmlbasicscript.cpp index 603e6ba..ee537e4 100644 --- a/src/declarative/qml/script/qmlbasicscript.cpp +++ b/src/declarative/qml/script/qmlbasicscript.cpp @@ -789,6 +789,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c state = Incremental; } + qWarning("ReferenceError: %s is not defined", id); } else { // instr.type == ScriptInstruction::Fetch QVariant o = stack.pop(); diff --git a/src/declarative/qml/script/qmlbasicscript_p.h b/src/declarative/qml/script/qmlbasicscript_p.h index bcb7d00..fb9951e 100644 --- a/src/declarative/qml/script/qmlbasicscript_p.h +++ b/src/declarative/qml/script/qmlbasicscript_p.h @@ -39,6 +39,7 @@ public: }; int coreType; + bool isValid() const { return type != Invalid; } bool isCore() const { return type == Core; } bool isExplicit() const { return type == Explicit; } void clear(); |