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

Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62

3 files changed, 12 insertions, 3 deletions

diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index cec8ad62cb..32b76ee5bd 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -183,9 +183,6 @@ DEFINEFUNC(dbus_bool_t        , dbus_connection_add_filter, (DBusConnection
                                                              void                      *user_data,
                                                              DBusFreeFunction           free_data_function),
            (connection, function, user_data, free_data_function), return)
-DEFINEFUNC(dbus_bool_t        , dbus_connection_can_send_type, (DBusConnection             *connection,
-                                                                int                         type),
-           (connection, type), return)
 DEFINEFUNC(void               , dbus_connection_close,      (DBusConnection             *connection),
            (connection), return)
 DEFINEFUNC(DBusDispatchStatus , dbus_connection_dispatch,   (DBusConnection             *connection),
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index 96caa80549..77f48c03a4 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -174,6 +174,12 @@ QDBusUnixFileDescriptor &QDBusUnixFileDescriptor::operator=(const QDBusUnixFileD
 }
 
 /*!
+   \fn QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other)
+
+   Move-assigns  \a other to this QDBusUnixFileDescriptor.
+*/
+
+/*!
     Destroys this QDBusUnixFileDescriptor object and disposes of the Unix file descriptor that it contained.
 */
 QDBusUnixFileDescriptor::~QDBusUnixFileDescriptor()
diff --git a/src/dbus/qdbusvirtualobject.cpp b/src/dbus/qdbusvirtualobject.cpp
index aeeb2a1f2b..b65e71eef7 100644
--- a/src/dbus/qdbusvirtualobject.cpp
+++ b/src/dbus/qdbusvirtualobject.cpp
@@ -37,11 +37,17 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    Constructs a QDBusVirtualObject with \a parent.
+*/
 QDBusVirtualObject::QDBusVirtualObject(QObject *parent) :
     QObject(parent)
 {
 }
 
+/*!
+    Destroys the object, deleting all of its child objects.
+*/
 QDBusVirtualObject::~QDBusVirtualObject()
 {
 }