summaryrefslogtreecommitdiff
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 18:17:22 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 18:17:22 +0200
commitc7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (patch)
tree9c66c63f89e9ab90737c57bbb649e552860e7ac4 /src/declarative/qml
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
parent875fc441887e7592afe1c2c1df9ffd1b889b4eca (diff)
downloadqt4-tools-c7afbc97d4cb60ed11996d0bcbbddaac2b18d18c.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativeinfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index c6560ddb94..56c05993b1 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -55,7 +55,8 @@ QT_BEGIN_NAMESPACE
\fn QDeclarativeInfo qmlInfo(const QObject *object)
\relates QDeclarativeEngine
- \brief Prints warnings messages that include the file and line number for QML types.
+ Prints warning messages that include the file and line number for the
+ specified QML \a object.
When QML types display warning messages, it improves traceability
if they include the QML file and line number on which the