diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 13:42:11 +0100 |
commit | 5e8ae03578ecd0538a774505f2f7e2fc626b0ab7 (patch) | |
tree | 3b6f704df4d55d0ed2a5a706acf785541a74a45e /src/widgets/itemviews | |
parent | 7a5fea113ec6088135b0b6a0fc4297e0ef362bc5 (diff) | |
parent | be3fb9afe50361e4b35d02d28ef30851335b17b6 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/kernel/qtimerinfo_unix.cpp
src/plugins/platforms/cocoa/qcocoabackingstore.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index ec5620c14c..5599d251a1 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -1082,6 +1082,8 @@ int QHeaderView::logicalIndex(int visualIndex) const } /*! + \since 5.0 + If \a movable is true, the header may be moved by the user; otherwise it is fixed in place. @@ -1105,6 +1107,8 @@ void QHeaderView::setSectionsMovable(bool movable) */ /*! + \since 5.0 + Returns true if the header can be moved by the user; otherwise returns false. @@ -1128,6 +1132,8 @@ bool QHeaderView::sectionsMovable() const */ /*! + \since 5.0 + If \a clickable is true, the header will respond to single clicks. \sa sectionsClickable(), sectionClicked(), sectionPressed(), @@ -1151,6 +1157,8 @@ void QHeaderView::setSectionsClickable(bool clickable) */ /*! + \since 5.0 + Returns true if the header is clickable; otherwise returns false. A clickable header could be set up to allow the user to change the representation of the data in the view related to the header. @@ -1187,6 +1195,8 @@ bool QHeaderView::highlightSections() const } /*! + \since 5.0 + Sets the constraints on how the header can be resized to those described by the given \a mode. @@ -1205,6 +1215,8 @@ void QHeaderView::setSectionResizeMode(ResizeMode mode) } /*! + \since 5.0 + Sets the constraints on how the section specified by \a logicalIndex in the header can be resized to those described by the given \a mode. The logical index should exist at the time this function is called. @@ -1259,6 +1271,8 @@ void QHeaderView::setSectionResizeMode(int logicalIndex, ResizeMode mode) */ /*! + \since 5.0 + Returns the resize mode that applies to the section specified by the given \a logicalIndex. |