aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2011-04-29 15:54:59 +0200
committerChristiaan Janssen <christiaan.janssen@nokia.com>2011-05-27 15:59:54 +0200
commit5819e7edf72b0e69822d9bf7918b7ccad195a307 (patch)
treef548a09d815e75f8396b9bccd347f137fb32ab8c
parent3cb7e322e80c14ed1e2f2d73962c19295fa476b7 (diff)
QmlDebugger: removing slots in Live Preview
Reviewed-by: Kai Koehne (cherry picked from commit 582be247290fd015798b3d84d692c0236dbff4e1)
-rw-r--r--src/declarative/qml/qdeclarativeenginedebug.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 330fcb9068..8f22314530 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -653,7 +653,10 @@ void QDeclarativeEngineDebugServer::resetBinding(int objectId, const QString &pr
}
}
}
- } else {
+ } else if (hasValidSignal(object, propertyName)) {
+ QDeclarativeProperty property(object, propertyName, context);
+ QDeclarativePropertyPrivate::setSignalExpression(property, 0);
+ } else {
if (QDeclarativePropertyChanges *propertyChanges = qobject_cast<QDeclarativePropertyChanges *>(object)) {
propertyChanges->removeProperty(propertyName);
}