Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 2 insertions, 3 deletions

diff --git a/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp
index 74d88caae6..302042a6b3 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp
+++ b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp
@@ -52,13 +52,11 @@
 
 #include <QIcon>
 #include <QPixmap>
-#include <QImage>
 #include <QMenu>
 #include <QAction>
 #include <QActionGroup>
 #include <QToolButton>
 #include <QWidgetAction>
-#include <QDebug>
 
 FilterWidget::FilterWidget(QWidget *parent)
     : QLineEdit(parent)
@@ -127,7 +125,8 @@ QRegExp::PatternSyntax FilterWidget::patternSyntax() const
 
 void FilterWidget::setPatternSyntax(QRegExp::PatternSyntax s)
 {
-    foreach (QAction *a, m_patternGroup->actions()) {
+    const QList<QAction*> actions = m_patternGroup->actions();
+    for (QAction *a : actions) {
         if (patternSyntaxFromAction(a) == s) {
             a->setChecked(true);
             break;