diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
| commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
| tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /src/widgets/itemviews/qtreewidget.cpp | |
| parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
| parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'src/widgets/itemviews/qtreewidget.cpp')
| -rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 41958517c8..8e86775a2d 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -1896,7 +1896,7 @@ void QTreeWidgetItem::addChild(QTreeWidgetItem *child) /*! Inserts the \a child item at \a index in the list of children. - If the child has already been inserted somewhere else it wont be inserted again. + If the child has already been inserted somewhere else it won't be inserted again. */ void QTreeWidgetItem::insertChild(int index, QTreeWidgetItem *child) { @@ -1998,7 +1998,7 @@ void QTreeWidgetItem::addChildren(const QList<QTreeWidgetItem*> &children) Inserts the given list of \a children into the list of the item children at \a index . - Children that have already been inserted somewhere else wont be inserted. + Children that have already been inserted somewhere else won't be inserted. */ void QTreeWidgetItem::insertChildren(int index, const QList<QTreeWidgetItem*> &children) { @@ -2621,7 +2621,7 @@ int QTreeWidget::topLevelItemCount() const /*! Inserts the \a item at \a index in the top level in the view. - If the item has already been inserted somewhere else it wont be inserted. + If the item has already been inserted somewhere else it won't be inserted. \sa addTopLevelItem(), columnCount() */ @@ -2675,7 +2675,7 @@ int QTreeWidget::indexOfTopLevelItem(QTreeWidgetItem *item) const Inserts the list of \a items at \a index in the top level in the view. - Items that have already been inserted somewhere else wont be inserted. + Items that have already been inserted somewhere else won't be inserted. \sa addTopLevelItems() */ |