From 8ff4b2dbeeba8ffc6503a6a8ac53a3df2625298a Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Mon, 28 May 2012 12:08:06 +1000 Subject: Check for Q_GLOBAL_STATIC returning 0 (simulator plugin). Consolidate all of the Q_GLOBAL_STATIC data into 1 class so we have one lifetime to manage. Provide a static instance() method for use outside of the .cpp file and check for this returning 0. Change-Id: I243e2c5497e1c018ab7713bd9ef43ac22a658ff7 Reviewed-by: Lorn Potter Reviewed-by: Zsolt Simon --- src/plugins/sensors/simulator/simulatorproximitysensor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/sensors/simulator/simulatorproximitysensor.cpp') diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp index 5926dd77..44977abb 100644 --- a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp +++ b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp @@ -53,7 +53,7 @@ SimulatorProximitySensor::SimulatorProximitySensor(QSensor *sensor) void SimulatorProximitySensor::poll() { - QtMobility::QProximityReadingData data = get_qtProximityData(); + QtMobility::QProximityReadingData data = SensorsConnection::instance()->qtProximityData; quint64 newTimestamp; if (!data.timestamp.isValid()) newTimestamp = QDateTime::currentDateTime().toTime_t(); -- cgit v1.2.3