diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
| commit | 34bfad76d1afe4a0ee27496e740c8566387dc16c (patch) | |
| tree | c4304699a1a2d4a729bddfb3102a5ba3ad9a2cd8 /src/plugins/bearer/connman/qconnmanengine.cpp | |
| parent | 16c3df54960b776f35f59288b888e829e7e81002 (diff) | |
| parent | 608b66b5af75ae6982be428439eea735c00cc455 (diff) | |
| download | Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.zip Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.gz Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/plugins/bearer/connman/qconnmanengine.cpp')
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.cpp | 1 |
1 files changed, 1 insertions, 0 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); |