summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/simulator/simulatorcommon.cpp
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-05-28 14:10:29 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-13 20:33:16 +0100
commitce33c04b01fcd368c506335c2f105efbe9f4f702 (patch)
tree8eabdd3b11019acff5dd611950734d8f981205d0 /src/plugins/sensors/simulator/simulatorcommon.cpp
parentc7ea35f8ca25da17c78174b4e98f3c613f742cb2 (diff)
Register only the sensors the emulator knows about
Unfortunately, this involves a (long) round-trip so we start by registering all the types we know about then unregister and re-register the ones we're notified about. Change-Id: I8ae8b4a9037eeb21a65454519945c3c307979a14 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/sensors/simulator/simulatorcommon.cpp')
-rw-r--r--src/plugins/sensors/simulator/simulatorcommon.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/sensors/simulator/simulatorcommon.cpp b/src/plugins/sensors/simulator/simulatorcommon.cpp
index f07cc468..cec02181 100644
--- a/src/plugins/sensors/simulator/simulatorcommon.cpp
+++ b/src/plugins/sensors/simulator/simulatorcommon.cpp
@@ -80,8 +80,9 @@ public:
signals:
void queueConnectToServer();
- void connectionFailed();
void initialSensorsDataSent();
+ void connectionFailed();
+ void setAvailableFeatures(quint32 features);
void setAmbientLightData(const QtMobility::QAmbientLightReadingData &);
void setLightData(const QtMobility::QLightReadingData &);
void setAccelerometerData(const QtMobility::QAccelerometerReadingData &);
@@ -121,6 +122,8 @@ SensorsConnection::SensorsConnection(QObject *parent)
this, SLOT(initialSensorsDataSent()));
connect(mConnection, SIGNAL(connectionFailed()),
this, SLOT(slotConnectionFailed()));
+ connect(mConnection, SIGNAL(setAvailableFeatures(quint32)),
+ this, SIGNAL(setAvailableFeatures(quint32)));
connect(mConnection, SIGNAL(setAmbientLightData(QtMobility::QAmbientLightReadingData)),
this, SLOT(setAmbientLightData(QtMobility::QAmbientLightReadingData)));
connect(mConnection, SIGNAL(setLightData(QtMobility::QLightReadingData)),