Merge branch 'qtupgrade-5.6'

sailfishos · Jun 10, 2016 · d9a65d8 · d9a65d8
2 parents bfa4603 + f96c919
commit d9a65d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/plugins/declarative/src/voicecallaudiorecorder.cpp b/plugins/declarative/src/voicecallaudiorecorder.cpp
@@ -6,6 +6,7 @@
 #include <QDBusMessage>
 #include <QDir>
 #include <QLocale>
+#include <QDataStream>
 #include <QtDebug>
 
 namespace {

diff --git a/src/audiocallpolicyproxy.cpp b/src/audiocallpolicyproxy.cpp
@@ -301,9 +301,9 @@ void AudioCallPolicyProxy::disconnectResourceSet()
                         SLOT(onResourceSetReleasedByManager()));
 }
 
-void AudioCallPolicyProxy::onResourceSetError(quint32 errno, const char *errorMessage)
+void AudioCallPolicyProxy::onResourceSetError(quint32 errorno, const char *errorMessage)
 {
-    Q_UNUSED(errno)
+    Q_UNUSED(errorno)
     Q_UNUSED(errorMessage)
     TRACE
     Q_D(AudioCallPolicyProxy);

diff --git a/src/audiocallpolicyproxy.h b/src/audiocallpolicyproxy.h
@@ -55,7 +55,7 @@ public Q_SLOTS:
 protected Q_SLOTS:
     void invokeWithResources(QObject *receiver, const QString &method);
 
-    void onResourceSetError(quint32 errno, const char* errorMessage);
+    void onResourceSetError(quint32 errorno, const char* errorMessage);
     void onResourceSetGranted();
     void onResourceSetDenied();
     void onResourceSetLost();