Merge "Merge dev into 5.7" into refs/staging/5.7

4 files changed, 14 insertions, 42 deletions

diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index cba7e8aacc..26173b5e92 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -568,7 +568,7 @@ void QColumnViewPrivate::closeColumns(const QModelIndex &parent, bool build)
     bool clearAll = !parent.isValid();
     bool passThroughRoot = false;
 
-    QList<QModelIndex> dirsToAppend;
+    QVector<QModelIndex> dirsToAppend;
 
     // Find the last column that matches the parent's tree
     int currentColumn = -1;
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index bf6d26dbfe..53a5dcba9c 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -1015,10 +1015,7 @@ void QListView::paintEvent(QPaintEvent *e)
             if (viewState == EditingState)
                 option.state |= QStyle::State_Editing;
         }
-        if (*it == hover)
-            option.state |= QStyle::State_MouseOver;
-        else
-            option.state &= ~QStyle::State_MouseOver;
+        option.state.setFlag(QStyle::State_MouseOver, *it == hover);
 
         if (alternate) {
             int row = (*it).row();
@@ -1033,11 +1030,7 @@ void QListView::paintEvent(QPaintEvent *e)
                     alternateBase = (row & 1) != 0;
                 }
             }
-            if (alternateBase) {
-                option.features |= QStyleOptionViewItem::Alternate;
-            } else {
-                option.features &= ~QStyleOptionViewItem::Alternate;
-            }
+            option.features.setFlag(QStyleOptionViewItem::Alternate, alternateBase);
 
             // draw background of the item (only alternate row). rest of the background
             // is provided by the delegate
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 6a669d4a1f..714f09e893 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -824,10 +824,7 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
         QStyleOptionViewItem opt = option;
         opt.rect = rect;
         alternateBase = alternatingColors && (span->top() & 1);
-        if (alternateBase)
-            opt.features |= QStyleOptionViewItem::Alternate;
-        else
-            opt.features &= ~QStyleOptionViewItem::Alternate;
+        opt.features.setFlag(QStyleOptionViewItem::Alternate, alternateBase);
         drawCell(painter, opt, index);
         region -= rect;
         for (int r = span->top(); r <= span->bottom(); ++r) {
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index ccc7c34602..95f14bec78 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -1359,11 +1359,7 @@ void QTreeViewPrivate::paintAlternatingRowColors(QPainter *painter, QStyleOption
     }
     while (y <= bottom) {
         option->rect.setRect(0, y, viewport->width(), rowHeight);
-        if (current & 1) {
-            option->features |= QStyleOptionViewItem::Alternate;
-        } else {
-            option->features &= ~QStyleOptionViewItem::Alternate;
-        }
+        option->features.setFlag(QStyleOptionViewItem::Alternate, current & 1);
         ++current;
         q->style()->drawPrimitive(QStyle::PE_PanelItemViewRow, option, painter, q);
         y += rowHeight;
@@ -1709,11 +1705,9 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
             else
                 opt.state |= QStyle::State_HasFocus;
         }
-        if ((hoverRow || modelIndex == hover)
-            && (option.showDecorationSelected || (d->hoverBranch == -1)))
-            opt.state |= QStyle::State_MouseOver;
-        else
-            opt.state &= ~QStyle::State_MouseOver;
+        opt.state.setFlag(QStyle::State_MouseOver,
+                          (hoverRow || modelIndex == hover)
+                          && (option.showDecorationSelected || d->hoverBranch == -1));
 
         if (enabled) {
             QPalette::ColorGroup cg;
@@ -1729,11 +1723,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
         }
 
         if (alternate) {
-            if (d->current & 1) {
-                opt.features |= QStyleOptionViewItem::Alternate;
-            } else {
-                opt.features &= ~QStyleOptionViewItem::Alternate;
-            }
+            opt.features.setFlag(QStyleOptionViewItem::Alternate, d->current & 1);
         }
 
         /* Prior to Qt 4.3, the background of the branch (in selected state and
@@ -1832,11 +1822,7 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
         painter->setBrushOrigin(QPoint(0, verticalOffset()));
 
     if (d->alternatingColors) {
-        if (d->current & 1) {
-            opt.features |= QStyleOptionViewItem::Alternate;
-        } else {
-            opt.features &= ~QStyleOptionViewItem::Alternate;
-        }
+        opt.features.setFlag(QStyleOptionViewItem::Alternate, d->current & 1);
     }
 
     // When hovering over a row, pass State_Hover for painting the branch
@@ -1862,10 +1848,8 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
                     | (moreSiblings ? QStyle::State_Sibling : QStyle::State_None)
                     | (children ? QStyle::State_Children : QStyle::State_None)
                     | (expanded ? QStyle::State_Open : QStyle::State_None);
-        if (hoverRow || item == d->hoverBranch)
-            opt.state |= QStyle::State_MouseOver;
-        else
-            opt.state &= ~QStyle::State_MouseOver;
+        opt.state.setFlag(QStyle::State_MouseOver, hoverRow || item == d->hoverBranch);
+
         style()->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, painter, this);
     }
     // then go out level by level
@@ -1890,10 +1874,8 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
         }
         if (moreSiblings)
             opt.state |= QStyle::State_Sibling;
-        if (hoverRow || item == d->hoverBranch)
-            opt.state |= QStyle::State_MouseOver;
-        else
-            opt.state &= ~QStyle::State_MouseOver;
+        opt.state.setFlag(QStyle::State_MouseOver, hoverRow || item == d->hoverBranch);
+
         style()->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, painter, this);
         current = ancestor;
         ancestor = current.parent();