diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 01:50:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 01:50:34 (GMT) |
| commit | 8d312c3c91931d60ef3d4585cb729db21f3489c2 (patch) | |
| tree | 642c70e79da4173b74b4273049461e25078b384c | |
| parent | 899c6dfcbc0d5ffd8da5676b3496ae31d2515235 (diff) | |
| parent | 27b5da4ff5a762df0ab3e98ecde9dac4aa589178 (diff) | |
| download | Qt-8d312c3c91931d60ef3d4585cb729db21f3489c2.zip Qt-8d312c3c91931d60ef3d4585cb729db21f3489c2.tar.gz Qt-8d312c3c91931d60ef3d4585cb729db21f3489c2.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:
Associate qmlInfo() documentation with QDeclarativeEngine
| -rw-r--r-- | src/declarative/qml/qdeclarativeinfo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index c980a2a..c6560dd 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -53,6 +53,7 @@ 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. |