Merge branch 'master' of scm.dev.nokia.troll.no:addons/messagingframework

3 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
index ec0b8704..81344d40 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
@@ -373,6 +373,7 @@ QMailStore::ErrorCode QmfStorageManager::ensureDurability()
 
 QMailStore::ErrorCode QmfStorageManager::ensureDurability(const QList<QString> &identifiers)
 {
+    Q_UNUSED(identifiers)
 #if !defined(QMF_NO_DURABILITY) && !defined(QMF_NO_SYNCHRONOUS_DB)
     // Durability is not disabled
     
diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index 64af7a70..ce1953cb 100644
--- a/src/plugins/messageservices/smtp/smtpclient.cpp
+++ b/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -895,6 +895,7 @@ void SmtpClient::sendMoreData(qint64 bytesWritten)
 
     // Check if we have any pending data still waiting to be sent.
 #ifndef QT_NO_OPENSSL
+    Q_UNUSED(bytesWritten)
     QSslSocket *socket = qobject_cast<QSslSocket*>(&(transport->socket()));
     Q_ASSERT(socket);
     if (socket->encryptedBytesToWrite()
diff --git a/tests/tst_qcop/tst_qcop.cpp b/tests/tst_qcop/tst_qcop.cpp
index 0fcc78f1..bada4d03 100644
--- a/tests/tst_qcop/tst_qcop.cpp
+++ b/tests/tst_qcop/tst_qcop.cpp
@@ -174,7 +174,7 @@ void tst_QCop::test_qcopserver()
 
 void tst_QCop::test_qcopclient()
 {
-    QCopClient *client1 = new QCopClient(true, this);
+    new QCopClient(true, this);
 
     QCopLocalSocket * sock = new QCopLocalSocket;
     QCopClient *client = new QCopClient(sock, sock);