summaryrefslogtreecommitdiffstats
path: root/src/widgets/itemviews
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-09-29 13:37:46 +0200
committerGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-09-29 13:38:11 +0200
commit8ab25620d3df25c43011ae982f4614639578afb3 (patch)
treee94d53c6b7d231ca18f0787a0c09bec07d163a67 /src/widgets/itemviews
parentdfe853bff90444edf92a993e391df853780c9e8d (diff)
parent5222abfdf5f034bad12bbe12312a4149550495b7 (diff)
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts: src/network/socket/qnativesocketengine_unix.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 9dba8ef894..0a4e57812a 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -1002,6 +1002,9 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
\since 4.2
Hides the item if \a hide is true, otherwise shows the item.
+ \note A call to this function has no effect if the item is not currently in a view. In particular,
+ calling \c setHidden(true) on an item and only then adding it to a view will result in
+ a visible item.
\sa isHidden()
*/