diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
| commit | b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b (patch) | |
| tree | a1fc6a13d896327a44390c00c89ba8c4ad205234 /src/declarative/qml/qmlenginedebug.cpp | |
| parent | c60dfe1f2732670eb48d98c9772815d37a16ec3c (diff) | |
| parent | 1dfabbbb1b740060444a11cd894561aed3a884ad (diff) | |
| download | Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.zip Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.gz Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/qml/qmlenginedebug.cpp')
| -rw-r--r-- | src/declarative/qml/qmlenginedebug.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp index f5c1297..7896afe 100644 --- a/src/declarative/qml/qmlenginedebug.cpp +++ b/src/declarative/qml/qmlenginedebug.cpp @@ -108,11 +108,7 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx) if (prop.type() < QVariant::UserType) { rv.type = QmlObjectProperty::Basic; - if (qobject_cast<QmlBoundSignalParameters*>(obj) && prop.name() != QByteArray("objectName")) - // these "properties" only have meaning during signal emission - rv.value = tr("(signal parameter)"); - else - rv.value = prop.read(obj); + rv.value = prop.read(obj); } else if (QmlMetaType::isObject(prop.userType())) { rv.type = QmlObjectProperty::Object; } else if (QmlMetaType::isList(prop.userType()) || |