diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-04-29 00:10:35 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-04-29 00:10:35 (GMT) |
commit | dc5a2f46bd9676e69ed81d0b83199a533d1fca21 (patch) | |
tree | 9eb4b410c5243cceb45962bb880da865b80ea891 /src/declarative/qml/qmlinfo.cpp | |
parent | 978cf2724888f13ba1a0ebab65056c05fe112dad (diff) | |
parent | 1cb0906f04ed49de26575252740b8bb5190e3025 (diff) | |
download | Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.zip Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.tar.gz Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximageitem.cpp
src/declarative/fx/qfxpathview.cpp
src/declarative/util/qmllistmodel.cpp
Diffstat (limited to 'src/declarative/qml/qmlinfo.cpp')
-rw-r--r-- | src/declarative/qml/qmlinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index dc7f44c..a2b304f 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -75,7 +75,7 @@ QmlInfo::QmlInfo(QObject *object) : QDebug(QtWarningMsg) { *this << "QML"; - if(object) + if (object) *this << object->metaObject()->className(); *this << "(unknown location):"; } |