diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-16 23:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-16 23:00:15 (GMT) |
| commit | f021555182edb4163d1bca29ed16da6748029771 (patch) | |
| tree | 4e08270009ae458e698f52b4de2172e5f97b511e /src/declarative | |
| parent | da1b6e7199dfd63cce79af0bd875df78b4d199db (diff) | |
| parent | 640aad736476f7f8a4ec92fedecae234fb2e2d2e (diff) | |
| download | Qt-f021555182edb4163d1bca29ed16da6748029771.zip Qt-f021555182edb4163d1bca29ed16da6748029771.tar.gz Qt-f021555182edb4163d1bca29ed16da6748029771.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeenginedebug.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index bffe681..e54f7d6 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -146,7 +146,10 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx) if (binding) rv.binding = binding->expression(); - QVariant value = prop.read(obj); + QVariant value; + if (prop.userType() != 0) { + value = prop.read(obj); + } rv.value = valueContents(value); if (QDeclarativeValueTypeFactory::isValueType(prop.userType())) { |