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