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

2 files changed, 4 insertions, 4 deletions

diff --git a/examples/sql/cachedtable/tableeditor.cpp b/examples/sql/cachedtable/tableeditor.cpp
index 71e441486d..95c3047c76 100644
--- a/examples/sql/cachedtable/tableeditor.cpp
+++ b/examples/sql/cachedtable/tableeditor.cpp
@@ -85,9 +85,9 @@ TableEditor::TableEditor(const QString &tableName, QWidget *parent)
 //! [2]
 
 //! [3]
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submit()));
-    connect(revertButton, SIGNAL(clicked()), model, SLOT(revertAll()));
-    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(submitButton, &QPushButton::clicked, this, &TableEditor::submit);
+    connect(revertButton, &QPushButton::clicked,  model, &QSqlTableModel::revertAll);
+    connect(quitButton, &QPushButton::clicked, this, &TableEditor::close);
 //! [3]
 
 //! [4]
diff --git a/examples/sql/cachedtable/tableeditor.h b/examples/sql/cachedtable/tableeditor.h
index 6544276cbe..727aa88ab3 100644
--- a/examples/sql/cachedtable/tableeditor.h
+++ b/examples/sql/cachedtable/tableeditor.h
@@ -65,7 +65,7 @@ class TableEditor : public QWidget
     Q_OBJECT
 
 public:
-    explicit TableEditor(const QString &tableName, QWidget *parent = 0);
+    explicit TableEditor(const QString &tableName, QWidget *parent = nullptr);
 
 private slots:
     void submit();