Merge branch 'master' into refactor

Conflicts:
	src/gui/kernel/qapplication_qpa.cpp
	src/gui/kernel/qcursor_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.h
	src/gui/kernel/qwindowsysteminterface_qpa_p.h
	src/gui/text/qtextcontrol.cpp
	src/plugins/platforms/wayland/wayland.pro
	src/widgets/accessible/qaccessible2.h
	src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74

1 files changed, 15 insertions, 1 deletions

diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index 4bdd055f52..8b126af77e 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -69,6 +69,7 @@ class QDBusError;
 class QDBusMessage;
 class QDBusPendingCall;
 class QDBusConnectionInterface;
+class QDBusVirtualObject;
 class QObject;
 
 class QDBusConnectionPrivate;
@@ -104,8 +105,8 @@ public:
         // Qt 4.2 had a misspelling here
         ExportAllSignal = ExportAllSignals,
 #endif
-
         ExportChildObjects = 0x1000
+        // Reserved = 0xff000000
     };
     enum UnregisterMode {
         UnregisterNode,
@@ -113,6 +114,15 @@ public:
     };
     Q_DECLARE_FLAGS(RegisterOptions, RegisterOption)
 
+    enum VirtualObjectRegisterOption {
+        SingleNode = 0x0,
+        SubPath = 0x1
+        // Reserved = 0xff000000
+    };
+#ifndef Q_QDOC
+    Q_DECLARE_FLAGS(VirtualObjectRegisterOptions, VirtualObjectRegisterOption)
+#endif
+
     enum ConnectionCapability {
         UnixFileDescriptorPassing = 0x0001
     };
@@ -163,6 +173,9 @@ public:
     void unregisterObject(const QString &path, UnregisterMode mode = UnregisterNode);
     QObject *objectRegisteredAt(const QString &path) const;
 
+    bool registerVirtualObject(const QString &path, QDBusVirtualObject *object,
+                          VirtualObjectRegisterOption options = SingleNode);
+
     bool registerService(const QString &serviceName);
     bool unregisterService(const QString &serviceName);
 
@@ -192,6 +205,7 @@ private:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::RegisterOptions)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions)
 
 QT_END_NAMESPACE