From d910fa67be7981714bfc854a7b6cc10e0ecfb858 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 26 Nov 2010 20:55:49 +0100
Subject: Fix warning about uninitialised varibale.

This variable cannot be dereferenced when it's zero, but let's silence
the compiler warning (GCC 4.4 on ARM).
---
 src/plugins/bearer/connman/qconnmanengine.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 184ceb4..7ac86b3 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -726,6 +726,7 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
 
     if(servicePath.isEmpty()) {
         id = QString::number(qHash(networkPath));
+        serv = 0; // ### FIXME
     } else {
         id = QString::number(qHash(servicePath));
         serv = new QConnmanServiceInterface(servicePath,this);
-- 
cgit v0.12


From a22ecab92bacc57d0a788eb9713f442e95468fd3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Sun, 28 Nov 2010 12:46:00 +0100
Subject: Remove the FIXME, it's fixed

---
 src/plugins/bearer/connman/qconnmanengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 7ac86b3..7f3501e 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -726,7 +726,7 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath)
 
     if(servicePath.isEmpty()) {
         id = QString::number(qHash(networkPath));
-        serv = 0; // ### FIXME
+        serv = 0;
     } else {
         id = QString::number(qHash(servicePath));
         serv = new QConnmanServiceInterface(servicePath,this);
-- 
cgit v0.12


From 7dafb5ca875a714ed9a1ced1a44ca536b31a44de Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 22 Oct 2010 15:29:41 +0200
Subject: Autotest: fix mistake in verifying pointers

Don't assume that pointers on the heap appear always on the
positive half of the addressing space.
---
 tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 6b4904f..a05aa97 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -283,8 +283,8 @@ void tst_QSharedPointer::operators()
     QSharedPointer<char> p1;
     QSharedPointer<char> p2(new char);
     qptrdiff diff = p2.data() - p1.data();
-    Q_ASSERT(p1.data() < p2.data());
-    Q_ASSERT(diff > 0);
+    Q_ASSERT(p1.data() != p2.data());
+    Q_ASSERT(diff != 0);
 
     // operator-
     QCOMPARE(p2 - p1.data(), diff);
-- 
cgit v0.12