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

Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f

3 files changed, 10 insertions, 10 deletions

diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index 10318fb0ed..855ef5d394 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -49,11 +49,9 @@
 #include "ping-common.h"
 #include "complexping.h"
 
-void Ping::start(const QString &name, const QString &oldValue, const QString &newValue)
+void Ping::start(const QString &name)
 {
-    Q_UNUSED(oldValue);
-
-    if (name != SERVICE_NAME || newValue.isEmpty())
+    if (name != SERVICE_NAME)
         return;
 
     // open stdin for reading
@@ -105,10 +103,12 @@ int main(int argc, char **argv)
         return 1;
     }
 
+    QDBusServiceWatcher serviceWatcher(SERVICE_NAME, QDBusConnection::sessionBus(),
+                                       QDBusServiceWatcher::WatchForRegistration);
+
     Ping ping;
-    ping.connect(QDBusConnection::sessionBus().interface(),
-                 SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-                 SLOT(start(QString,QString,QString)));
+    QObject::connect(&serviceWatcher, &QDBusServiceWatcher::serviceRegistered,
+                     &ping, &Ping::start);
 
     QProcess pong;
     pong.start("./complexpong");
diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h
index 4eb571dd2f..f6f1505507 100644
--- a/examples/dbus/complexpingpong/complexping.h
+++ b/examples/dbus/complexpingpong/complexping.h
@@ -49,7 +49,7 @@ class Ping: public QObject
 {
     Q_OBJECT
 public slots:
-    void start(const QString &, const QString &, const QString &);
+    void start(const QString &);
 public:
     QFile qstdin;
     QDBusInterface *iface;
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
index 0e0d5fed76..682e301f12 100644
--- a/examples/dbus/complexpingpong/complexpong.cpp
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -61,7 +61,7 @@ void Pong::setValue(const QString &newValue)
 
 void Pong::quit()
 {
-    QTimer::singleShot(0, QCoreApplication::instance(), SLOT(quit()));
+    QTimer::singleShot(0, QCoreApplication::instance(), &QCoreApplication::quit);
 }
 
 QDBusVariant Pong::query(const QString &query)
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 
     QObject obj;
     Pong *pong = new Pong(&obj);
-    pong->connect(&app, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
+    QObject::connect(&app, &QCoreApplication::aboutToQuit, pong, &Pong::aboutToQuit);
     pong->setProperty("value", "initial value");
     QDBusConnection::sessionBus().registerObject("/", &obj);