diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 20:11:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 20:11:00 (GMT) |
| commit | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (patch) | |
| tree | 67e19820ef67dcc3b0cadb7abdbcd03550a5df32 /src/plugins | |
| parent | 90f885a7fea4afb719629967567353db84085ea0 (diff) | |
| parent | 66b9f79a9577ee50ca0a9ef8a2ac7a09a3e68a50 (diff) | |
| download | Qt-e8c01ab0e5fb6134617a69d88ed0cbce24a33da5.zip Qt-e8c01ab0e5fb6134617a69d88ed0cbce24a33da5.tar.gz Qt-e8c01ab0e5fb6134617a69d88ed0cbce24a33da5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
dbus does not use this. fix build.
Fix memory leak on exit
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 46b6e80..952a444 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -79,7 +79,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { QLatin1String(CONNMAN_MANAGER_PATH), QLatin1String(CONNMAN_MANAGER_INTERFACE), QLatin1String("PropertyChanged"), - this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & ))), Qt::UniqueConnection) { + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { qWarning() << "PropertyCHanged not connected"; } } @@ -89,7 +89,7 @@ if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { QLatin1String(CONNMAN_MANAGER_PATH), QLatin1String(CONNMAN_MANAGER_INTERFACE), QLatin1String("StateChanged"), - this,SIGNAL(stateChanged(const QString&))), Qt::UniqueConnection) { + this,SIGNAL(stateChanged(const QString&)))) { qWarning() << "StateChanged not connected"; } @@ -338,7 +338,7 @@ void QConnmanNetworkInterface::connectNotify(const char *signal) this->path(), QLatin1String(CONNMAN_NETWORK_INTERFACE), QLatin1String("PropertyChanged"), - this,SIGNAL(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection) { + this,SIGNAL(propertyChanged(QString,QDBusVariant)))) { qWarning() << "network properties not connected"; } } @@ -350,7 +350,7 @@ void QConnmanNetworkInterface::connectNotify(const char *signal) this->path(), QLatin1String(CONNMAN_NETWORK_INTERFACE), QLatin1String("PropertyChanged"), - helper,SLOT(propertyChanged(QString,QDBusVariant))), Qt::UniqueConnection; + helper,SLOT(propertyChanged(QString,QDBusVariant))); QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection); |