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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

1 files changed, 8 insertions, 6 deletions

diff --git a/examples/sql/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp
index 002dbc3242..ea4649b68d 100644
--- a/examples/sql/sqlbrowser/main.cpp
+++ b/examples/sql/sqlbrowser/main.cpp
@@ -80,16 +80,18 @@ int main(int argc, char *argv[])
     mainWin.setCentralWidget(&browser);
 
     QMenu *fileMenu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
-    fileMenu->addAction(QObject::tr("Add &Connection..."), &browser, SLOT(addConnection()));
+    fileMenu->addAction(QObject::tr("Add &Connection..."),
+            [&]() { browser.addConnection(); });
     fileMenu->addSeparator();
-    fileMenu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
+    fileMenu->addAction(QObject::tr("&Quit"), []() { qApp->quit(); });
 
     QMenu *helpMenu = mainWin.menuBar()->addMenu(QObject::tr("&Help"));
-    helpMenu->addAction(QObject::tr("About"), &browser, SLOT(about()));
-    helpMenu->addAction(QObject::tr("About Qt"), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(QObject::tr("About"), [&]() { browser.about(); });
+    helpMenu->addAction(QObject::tr("About Qt"), []() { qApp->aboutQt(); });
 
-    QObject::connect(&browser, SIGNAL(statusMessage(QString)),
-                     mainWin.statusBar(), SLOT(showMessage(QString)));
+    QObject::connect(&browser, &Browser::statusMessage, [&mainWin](const QString &text) {
+        mainWin.statusBar()->showMessage(text);
+    });
 
     addConnectionsFromCommandline(app.arguments(), &browser);
     mainWin.show();