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

 Conflicts:
	mkspecs/features/qt_common.prf
	src/corelib/tools/qstring.cpp
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/widgets/widgets/qmainwindowlayout_p.h

Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65

2 files changed, 4 insertions, 4 deletions

diff --git a/examples/widgets/richtext/orderform/detailsdialog.cpp b/examples/widgets/richtext/orderform/detailsdialog.cpp
index 3ec13c4c70..9ef9eff73d 100644
--- a/examples/widgets/richtext/orderform/detailsdialog.cpp
+++ b/examples/widgets/richtext/orderform/detailsdialog.cpp
@@ -71,8 +71,8 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
                                      | QDialogButtonBox::Cancel);
 
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(verify()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DetailsDialog::verify);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DetailsDialog::reject);
 //! [0]
 
 //! [1]
diff --git a/examples/widgets/richtext/orderform/mainwindow.cpp b/examples/widgets/richtext/orderform/mainwindow.cpp
index 030072978e..b207ee4dbc 100644
--- a/examples/widgets/richtext/orderform/mainwindow.cpp
+++ b/examples/widgets/richtext/orderform/mainwindow.cpp
@@ -75,8 +75,8 @@ MainWindow::MainWindow()
 
     letters = new QTabWidget;
 
-    connect(newAction, SIGNAL(triggered()), this, SLOT(openDialog()));
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
+    connect(newAction, &QAction::triggered, this, &MainWindow::openDialog);
+    connect(quitAction, &QAction::triggered, this, &MainWindow::close);
 
     setCentralWidget(letters);
     setWindowTitle(tr("Order Form"));