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

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 4 insertions, 2 deletions

diff --git a/examples/widgets/statemachine/rogue/window.cpp b/examples/widgets/statemachine/rogue/window.cpp
index 059fbf1003..a5363e2758 100644
--- a/examples/widgets/statemachine/rogue/window.cpp
+++ b/examples/widgets/statemachine/rogue/window.cpp
@@ -66,7 +66,8 @@ Window::Window()
         font = QFont("Monospace");
     }
     else {
-        foreach (QString family, database.families()) {
+        const QStringList fontFamilies = database.families();
+        for (const QString &family : fontFamilies ) {
             if (database.isFixedPitch(family)) {
                 font = QFont(family);
                 break;
@@ -217,7 +218,8 @@ void Window::buildMachine()
 //![5]
     machine->setInitialState(inputState);
 
-    connect(machine, SIGNAL(finished()), qApp, SLOT(quit()));
+    connect(machine, &QStateMachine::finished,
+            qApp, &QApplication::quit);
 
     machine->start();
 }