diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 19:28:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 19:28:00 (GMT) |
| commit | 640aad736476f7f8a4ec92fedecae234fb2e2d2e (patch) | |
| tree | 0fafee924e7ca84ff7d26d3d685868cfede1385a /src | |
| parent | 51bf60d7c79f94cee293aa9dbdc33da60327aaf7 (diff) | |
| parent | fa57982fadab625fb022d32f690ef05427920581 (diff) | |
| download | Qt-640aad736476f7f8a4ec92fedecae234fb2e2d2e.zip Qt-640aad736476f7f8a4ec92fedecae234fb2e2d2e.tar.gz Qt-640aad736476f7f8a4ec92fedecae234fb2e2d2e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebugger: Fix runtime warnings about unregistered metatypes
Diffstat (limited to 'src')
| -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())) { |