diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
| commit | ee0951d69b38f766e67262487be95b88501aa4a5 (patch) | |
| tree | 116c334060500be340d4d61c99026316b0df3ce9 /src/widgets/itemviews | |
| parent | 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff) | |
| parent | d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qftp.cpp
src/widgets/itemviews/qheaderview.cpp
src/widgets/itemviews/qlistview.cpp
tests/auto/network/access/qftp/tst_qftp.cpp
Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index 2b3e1f1732..e046e4781f 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -1499,7 +1499,8 @@ bool QHeaderView::stretchLastSection() const void QHeaderView::setStretchLastSection(bool stretch) { Q_D(QHeaderView); - const bool changedStretchMode = (d->stretchLastSection != stretch); + if (d->stretchLastSection == stretch) + return; d->stretchLastSection = stretch; if (d->state != QHeaderViewPrivate::NoState) return; @@ -1507,8 +1508,7 @@ void QHeaderView::setStretchLastSection(bool stretch) d->setNewLastSection(d->lastVisibleVisualIndex()); resizeSections(); } else { - if (changedStretchMode) - d->restoreSizeOnPrevLastSection(); + d->restoreSizeOnPrevLastSection(); } } |