4 files changed, 23 insertions, 21 deletions
diff --git a/src/corelib/doc/snippets/statemachine/main.cpp b/src/corelib/doc/snippets/statemachine/main.cpp
index 8cd8b69e12..c399f4f199 100644
--- a/src/corelib/doc/snippets/statemachine/main.cpp
+++ b/src/corelib/doc/snippets/statemachine/main.cpp
@@ -48,13 +48,14 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 int main(int argv, char **args)
 {
     QApplication app(argv, args);
 
     QLabel *label = new QLabel;
+    QPushButton *button = new QPushButton;
 
 //![0]
     QStateMachine machine;
@@ -70,14 +71,14 @@ int main(int argv, char **args)
 //![4]
 
 //![5]
-    QObject::connect(s3, SIGNAL(entered()), button, SLOT(showMaximized()));
-    QObject::connect(s3, SIGNAL(exited()), button, SLOT(showMinimized()));
+    QObject::connect(s3, &QState::entered, button, &QPushButton:showMaximized);
+    QObject::connect(s3, &QState::exited, button, &QPushButton::showMinimized);
 //![5]
 
 //![1]
-    s1->addTransition(button, SIGNAL(clicked()), s2);
-    s2->addTransition(button, SIGNAL(clicked()), s3);
-    s3->addTransition(button, SIGNAL(clicked()), s1);
+    s1->addTransition(button, &QPushButton::clicked, s2);
+    s2->addTransition(button, &QPushButton::clicked, s3);
+    s3->addTransition(button, &QPushButton::clicked, s1);
 //![1]
 
 //![2]
diff --git a/src/corelib/doc/snippets/statemachine/main2.cpp b/src/corelib/doc/snippets/statemachine/main2.cpp
index 96eb912b14..dedd2d29bf 100644
--- a/src/corelib/doc/snippets/statemachine/main2.cpp
+++ b/src/corelib/doc/snippets/statemachine/main2.cpp
@@ -48,11 +48,11 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 int main(int argv, char **args)
 {
-  QApplication app(argv, args);
+    QApplication app(argv, args);
 
     QStateMachine machine;
 
@@ -66,16 +66,17 @@ int main(int argv, char **args)
 //![0]
 
 //![2]
-    s12->addTransition(quitButton, SIGNAL(clicked()), s12);
+    s12->addTransition(quitButton, &QPushButton::clicked, s12);
 //![2]
 
 //![1]
     QFinalState *s2 = new QFinalState();
-    s1->addTransition(quitButton, SIGNAL(clicked()), s2);
+    s1->addTransition(quitButton, &QPushButton::clicked, s2);
     machine.addState(s2);
     machine.setInitialState(s1);
 
-    QObject::connect(&machine, SIGNAL(finished()), QApplication::instance(), SLOT(quit()));
+    QObject::connect(&machine, &QStateMachine::finished,
+                     QCoreApplication::instance(), &QCoreApplication::quit);
 //![1]
 
   QButton *interruptButton = new QPushButton("Interrupt Button");
@@ -90,11 +91,11 @@ int main(int argv, char **args)
     mbox->addButton(QMessageBox::Ok);
     mbox->setText("Interrupted!");
     mbox->setIcon(QMessageBox::Information);
-    QObject::connect(s3, SIGNAL(entered()), mbox, SLOT(exec()));
+    QObject::connect(s3, &QState::entered, mbox, &QMessageBox::exec);
     s3->addTransition(s1h);
     machine.addState(s3);
 
-    s1->addTransition(interruptButton, SIGNAL(clicked()), s3);
+    s1->addTransition(interruptButton, &QPushButton::clicked, s3);
 //![3]
 
   return app.exec();
diff --git a/src/corelib/doc/snippets/statemachine/main3.cpp b/src/corelib/doc/snippets/statemachine/main3.cpp
index bc9a0e29c4..b665565aef 100644
--- a/src/corelib/doc/snippets/statemachine/main3.cpp
+++ b/src/corelib/doc/snippets/statemachine/main3.cpp
@@ -62,7 +62,7 @@ int main(int argv, char **args)
 //![0]
 
 //![1]
-  s1->addTransition(s1, SIGNAL(finished()), s2);
+  s1->addTransition(s1, &QState::finished, s2);
 //![1]
 
     return app.exec();
diff --git a/src/corelib/doc/snippets/statemachine/main5.cpp b/src/corelib/doc/snippets/statemachine/main5.cpp
index 38bb2cb475..d701f51e2b 100644
--- a/src/corelib/doc/snippets/statemachine/main5.cpp
+++ b/src/corelib/doc/snippets/statemachine/main5.cpp
@@ -98,7 +98,7 @@ int main(int argv, char **args)
     s1->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
     s2->assignProperty(button, "geometry", QRectF(0, 0, 100, 100));
 
-    s1->addTransition(button, SIGNAL(clicked()), s2);
+    s1->addTransition(button, &QPushButton::clicked, s2);
 //![3]
 
   }
@@ -111,7 +111,7 @@ int main(int argv, char **args)
     s1->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
     s2->assignProperty(button, "geometry", QRectF(0, 0, 100, 100));
 
-    QSignalTransition *transition = s1->addTransition(button, SIGNAL(clicked()), s2);
+    QSignalTransition *transition = s1->addTransition(button, &QPushButton::clicked, s2);
     transition->addAnimation(new QPropertyAnimation(button, "geometry"));
 //![4]
 
@@ -130,9 +130,9 @@ int main(int argv, char **args)
 
     QState *s2 = new QState();
     s2->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
-    connect(s2, SIGNAL(entered()), messageBox, SLOT(exec()));
+    connect(s2, &QState::entered, messageBox, SLOT(exec()));
 
-    s1->addTransition(button, SIGNAL(clicked()), s2);
+    s1->addTransition(button, &QPushButton::clicked, s2);
 //![5]
   }
 
@@ -151,10 +151,10 @@ int main(int argv, char **args)
     s2->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
 
     QState *s3 = new QState();
-    connect(s3, SIGNAL(entered()), messageBox, SLOT(exec()));
+    connect(s3, &QState::entered, messageBox, SLOT(exec()));
 
-    s1->addTransition(button, SIGNAL(clicked()), s2);
-    s2->addTransition(s2, SIGNAL(propertiesAssigned()), s3);
+    s1->addTransition(button, &QPushButton::clicked, s2);
+    s2->addTransition(s2, &QState::propertiesAssigned, s3);
 //![6]
 
   }