From ff9ecbf2b88c5cc246005b76620789d90734d054 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Wed, 15 Jan 2014 22:59:36 +0100
Subject: Bump MODULE_VERSION to 5.2.2

Change-Id: Ic173a32836639e664e8349b28b101ee26a45ff78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 45d05b25..5d8fd36b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.2.1
+MODULE_VERSION = 5.2.2
-- 
cgit v1.2.3


From 9a8319a39a06d6cf3163978301d650b8f3558c62 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@jollamobile.com>
Date: Thu, 16 Jan 2014 09:52:46 -0600
Subject: Use correct method signature for slots.

Change-Id: I09b5df218ad22afefe8a615c80585aa3fb46006f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
---
 src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
index 247ee37a..299c20ed 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
@@ -68,9 +68,9 @@ SensorfwSensorBase::SensorfwSensorBase(QSensor *sensor)
             QDBusServiceWatcher::WatchForUnregistration, this);
 
     connect(watcher, SIGNAL(serviceRegistered(QString)),
-            this, SLOT(connectToSensord(QString)));
+            this, SLOT(connectToSensord()));
     connect(watcher, SIGNAL(serviceUnregistered(QString)),
-            this, SLOT(sensordUnregistered(QString)));
+            this, SLOT(sensordUnregistered()));
 
 
     m_available = QDBusConnection::systemBus().interface()->isServiceRegistered("com.nokia.SensorService");
-- 
cgit v1.2.3