diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-28 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-28 23:00:11 (GMT) |
| commit | 79f1bce5cef4cf98b426658252a479221e1ea4fa (patch) | |
| tree | fb9f8cebe1f311c5b4572cb70d8c336686f603a2 | |
| parent | 37766cd0781218598daffeaa7fa9d1707ec14b38 (diff) | |
| parent | c874a2a97101e506148e852debc23a898691b892 (diff) | |
| download | Qt-79f1bce5cef4cf98b426658252a479221e1ea4fa.zip Qt-79f1bce5cef4cf98b426658252a479221e1ea4fa.tar.gz Qt-79f1bce5cef4cf98b426658252a479221e1ea4fa.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp index 184ceb4..7f3501e 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; } else { id = QString::number(qHash(servicePath)); serv = new QConnmanServiceInterface(servicePath,this); 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); |