summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativexmllistmodel.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-14 11:50:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-14 11:50:03 (GMT)
commit09503163c88d57b9b163530131c0ec0a1e4194fd (patch)
treeaa4cadf08f69929b66945648a43a4e18790ecffc /src/declarative/util/qdeclarativexmllistmodel.cpp
parent5878027280de47e8b8fc72a4d0d48f5e5f6dc7db (diff)
parent56e24c99ee7a1b5b127b93cbab98f88e008ec9b8 (diff)
downloadQt-09503163c88d57b9b163530131c0ec0a1e4194fd.zip
Qt-09503163c88d57b9b163530131c0ec0a1e4194fd.tar.gz
Qt-09503163c88d57b9b163530131c0ec0a1e4194fd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" Attempt to fix build failure with msvc200{5,8} on Windows XP. fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM ...
Diffstat (limited to 'src/declarative/util/qdeclarativexmllistmodel.cpp')
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 9895ff2..9f4df22 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -596,7 +596,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
with a combined value of all key roles that is not already present in
the model.
- \sa {demos/declarative/rssnews}{RSS News demo}
+ \sa {RSS News}
*/
QDeclarativeXmlListModel::QDeclarativeXmlListModel(QObject *parent)