Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qvariant.cpp
	src/corelib/serialization/qjsoncbor.cpp
	src/corelib/serialization/qjsonvalue.cpp
	src/corelib/tools/tools.pri
	src/gui/image/qimage.cpp
	src/gui/kernel/qguivariant.cpp
	src/widgets/kernel/qshortcut.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json
	tests/auto/tools/moc/tst_moc.cpp
        src/opengl/qglframebufferobject.cpp

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271

1 files changed, 7 insertions, 7 deletions

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]
 
   }