diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 00:36:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 00:36:09 (GMT) |
| commit | e625f21c7333ef0befe824a7097a7ffb0c349ec9 (patch) | |
| tree | 2b7a8bfc7b47381c2957cc099ae0ce374dec90a6 | |
| parent | f6fd0ec480170713044d39d6ee0ebcf0a6435042 (diff) | |
| parent | 184458394b344947bea1852ab88561dc60db6038 (diff) | |
| download | Qt-e625f21c7333ef0befe824a7097a7ffb0c349ec9.zip Qt-e625f21c7333ef0befe824a7097a7ffb0c349ec9.tar.gz Qt-e625f21c7333ef0befe824a7097a7ffb0c349ec9.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:
Quiet unused parameter warnings.
| -rw-r--r-- | src/plugins/bearer/icd/qicdengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index a5a183b..96827f3 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -966,6 +966,9 @@ void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) void QIcdEngine::icdServiceOwnerChanged(const QString &serviceName, const QString &oldOwner, const QString &newOwner) { + Q_UNUSED(serviceName); + Q_UNUSED(oldOwner); + QMutexLocker locker(&mutex); if (newOwner.isEmpty()) { |