Rex Dieter 0aff623
From d0b790dcd02da959cbdfc83d606906cead9e8375 Mon Sep 17 00:00:00 2001
Rex Dieter 0aff623
From: David Faure <david.faure@kdab.com>
Rex Dieter 0aff623
Date: Sat, 12 Apr 2014 11:25:28 +0200
Rex Dieter 0aff623
Subject: [PATCH 10/37] QDbus: Fix (!a == b) comparison
Rex Dieter 0aff623
Rex Dieter 0aff623
! binds to a, and that is wrong here.
Rex Dieter 0aff623
Rex Dieter 0aff623
(cherry picked from qtbase/4b7cd57719a637189696d673b014ae785df669bf)
Rex Dieter 0aff623
Rex Dieter 0aff623
Change-Id: I75542a0c27f39fb6e684dedd9925a1f3748d4919
Rex Dieter 0aff623
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Rex Dieter 0aff623
---
Rex Dieter 0aff623
 src/dbus/qdbuspendingcall.cpp | 2 +-
Rex Dieter 0aff623
 1 file changed, 1 insertion(+), 1 deletion(-)
Rex Dieter 0aff623
Rex Dieter 0aff623
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
Rex Dieter 0aff623
index 06597a6..b7def2e 100644
Rex Dieter 0aff623
--- a/src/dbus/qdbuspendingcall.cpp
Rex Dieter 0aff623
+++ b/src/dbus/qdbuspendingcall.cpp
Rex Dieter 0aff623
@@ -225,7 +225,7 @@ void QDBusPendingCallPrivate::checkReceivedSignature()
Rex Dieter 0aff623
         return;                 // no signature to validate against
Rex Dieter 0aff623
 
Rex Dieter 0aff623
     // can't use startsWith here because a null string doesn't start or end with an empty string
Rex Dieter 0aff623
-    if (!replyMessage.signature().indexOf(expectedReplySignature) == 0) {
Rex Dieter 0aff623
+    if (replyMessage.signature().indexOf(expectedReplySignature) != 0) {
Rex Dieter 0aff623
         QString errorMsg = QLatin1String("Unexpected reply signature: got \"%1\", "
Rex Dieter 0aff623
                                          "expected \"%2\"");
Rex Dieter 0aff623
         replyMessage = QDBusMessage::createError(
Rex Dieter 0aff623
-- 
Rex Dieter 0aff623
1.9.3
Rex Dieter 0aff623