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

Conflicts:
	config.tests/unix/ptrsize.test
	configure
	src/corelib/global/qnamespace.h
	src/network/socket/qabstractsocket.cpp
	tests/auto/other/networkselftest/networkselftest.pro

Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672

1 files changed, 23 insertions, 0 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.h b/src/plugins/platforminputcontexts/ibus/qibusproxy.h
index 69443a524d..bbaebe1b96 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusproxy.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.h
@@ -20,6 +20,8 @@
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
 
+#include "qibustypes.h"
+
 /*
  * Proxy class for interface org.freedesktop.IBus
  */
@@ -29,6 +31,8 @@ class QIBusProxy: public QDBusAbstractInterface
 public:
     static inline const char *staticInterfaceName()
     { return "org.freedesktop.IBus"; }
+    static inline QString dbusInterfaceProperties()
+    { return QStringLiteral("org.freedesktop.DBus.Properties"); }
 
 public:
     QIBusProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
@@ -82,7 +86,26 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QLatin1String("RegisterComponent"), argumentList);
     }
 
+    inline QDBusPendingReply<QDBusVariant> GetGlobalEngine()
+    {
+        if (!this->isValid() || this->service().isEmpty() || this->path().isEmpty())
+             return QDBusMessage::createError(this->lastError());
+
+        QDBusMessage msg = QDBusMessage::createMethodCall(this->service(),
+                                                          this->path(),
+                                                          dbusInterfaceProperties(),
+                                                          QStringLiteral("Get"));
+        msg << this->interface() << QStringLiteral("GlobalEngine");
+        return this->connection().asyncCall(msg, this->timeout());
+    }
+
+    QIBusEngineDesc getGlobalEngine();
+
+private:
+    void globalEngineChanged(const QString &engine_name);
+
 Q_SIGNALS: // SIGNALS
+    void GlobalEngineChanged(const QString &engine_name);
 };
 
 #endif