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

Change-Id: I5839bded07e23af65ced9491c4f50242f964dd31

6 files changed, 6 insertions, 59 deletions

diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 67680f6b82..1991a462e9 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -286,8 +286,6 @@ DEFINEFUNC(const char*   , dbus_message_get_sender, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(dbus_uint32_t , dbus_message_get_serial, (DBusMessage   *message),
            (message), return)
-DEFINEFUNC(dbus_uint32_t , dbus_message_get_reply_serial, (DBusMessage   *message),
-           (message), return)
 DEFINEFUNC(const char*   , dbus_message_get_signature, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(int           , dbus_message_get_type, (DBusMessage   *message),
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index 40e97ae483..d6a329cfe8 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -130,11 +130,11 @@ static const int errorMessages_indices[] = {
     0,    6,   40,   76,  118,  153,  191,  231,
     273,  313,  349,  384,  421,  461,  501,  540,
     581,  617,  661,  705,  746,  789,  833,  874,
-    916,  961, 1005,   -1
+    916,  961, 1005
 };
 
 static const int errorMessages_count = sizeof errorMessages_indices /
-                                       sizeof errorMessages_indices[0] - 1;
+                                       sizeof errorMessages_indices[0];
 
 static inline const char *get(QDBusError::ErrorType code)
 {
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 84bd90d06d..c4e506ff0e 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1818,8 +1818,8 @@ bool QDBusConnectionPrivate::send(const QDBusMessage& message)
     }
 
     q_dbus_message_set_no_reply(msg, true); // the reply would not be delivered to anything
-    emit messageNeedsSending(Q_NULLPTR, msg);
     qDBusDebug() << this << "sending message (no reply):" << message;
+    emit messageNeedsSending(Q_NULLPTR, msg);
     return true;
 }
 
@@ -2018,8 +2018,8 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
         lastError = error;
         processFinishedCall(pcall);
     } else {
-        emit messageNeedsSending(pcall, msg, timeout);
         qDBusDebug() << this << "sending message:" << message;
+        emit messageNeedsSending(pcall, msg, timeout);
     }
     return pcall;
 }
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 078442f3f1..32b7787514 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -188,12 +188,7 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
 
     // check if everything is ok
     if (marshaller.ok)
-    {
-        QDBusMessage *m = (QDBusMessage*)&message;
-        q_dbus_message_ref(msg);
-        m->d_ptr->msg = msg;
         return msg;
-    }
 
     // not ok;
     q_dbus_message_unref(msg);
@@ -322,16 +317,6 @@ QDBusMessage QDBusMessagePrivate::makeLocalReply(const QDBusConnectionPrivate &c
     return QDBusMessage();      // failed
 }
 
-uint QDBusMessagePrivate::serial()
-{
-    return msg ? q_dbus_message_get_serial(msg) : reply ? q_dbus_message_get_serial(reply) : 0;
-}
-
-uint QDBusMessagePrivate::replySerial()
-{
-    return msg ? q_dbus_message_get_reply_serial(msg) : reply ? q_dbus_message_get_reply_serial(reply) : 0;
-}
-
 /*!
     \class QDBusMessage
     \inmodule QtDBus
@@ -648,32 +633,6 @@ QString QDBusMessage::signature() const
 }
 
 /*!
-    Returns the serial of the message or 0 if undefined.
-
-    The serial number is a unique identifier of a message coming from a
-    given connection.
-
-    The serial is set to a non zero value after the message has been sent
-    over a D-Bus connection.
-*/
-uint QDBusMessage::serial() const
-{
-    return d_ptr->serial();
-}
-
-/*!
-    Returns the serial of the message this is a reply to or 0 if undefined.
-
-    The serial number is a unique identifier of a message coming from a
-    given connection and D-Bus messages of 'method return' or 'error' type
-    use them to match the reply to the method call message.
-*/
-uint QDBusMessage::replySerial() const
-{
-    return d_ptr->replySerial();
-}
-
-/*!
     Returns the flag that indicates if this message should see a reply
     or not. This is only meaningful for \l {MethodCallMessage}{method
     call messages}: any other kind of message cannot have replies and
@@ -861,16 +820,10 @@ QDebug operator<<(QDebug dbg, const QDBusMessage &msg)
         msg.type() == QDBusMessage::SignalMessage)
         dbg.nospace() << ", path=" << msg.path()
                       << ", interface=" << msg.interface()
-                      << ", member=" << msg.member()
-                      << ", serial=" << msg.serial();
+                      << ", member=" << msg.member();
     if (msg.type() == QDBusMessage::ErrorMessage)
         dbg.nospace() << ", error name=" << msg.errorName()
-                      << ", error message=" << msg.errorMessage()
-                      << ", serial=" << msg.serial()
-                      << ", reply serial=" << msg.replySerial();
-    else if (msg.type() == QDBusMessage::ReplyMessage)
-        dbg.nospace() << ", serial=" << msg.serial()
-                      << ", reply serial=" << msg.replySerial();
+                      << ", error message=" << msg.errorMessage();
     dbg.nospace() << ", signature=" << msg.signature()
                   << ", contents=(";
     debugVariantList(dbg, msg.arguments());
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index f6538bd2cf..e85d600080 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -104,8 +104,6 @@ public:
     QString errorMessage() const;
     MessageType type() const;
     QString signature() const;
-    uint serial() const;
-    uint replySerial() const;
 
     bool isReplyRequired() const;
 
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 0ad9924cac..5abd490502 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -93,8 +93,6 @@ public:
                                   const QDBusMessage &asSent);
     static QDBusMessage makeLocalReply(const QDBusConnectionPrivate &conn,
                                        const QDBusMessage &asSent);
-    uint serial();
-    uint replySerial();
 };
 
 QT_END_NAMESPACE