diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2012-02-06 16:04:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 01:54:20 +0100 |
| commit | 820e423d6bfe5368b081c6956c767ea8027df0d6 (patch) | |
| tree | cf16d6430ea9f8ae551b0bd698d6d4c69a091d6f /src | |
| parent | 14ddbd5f3aa4e090aca3c5c70df3d7eb9fd5e40d (diff) | |
make emulator gesture plugin working in emulator
Change-Id: I7cbc00ad75cac88a815eb43c937a10ec01d7023f
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src')
4 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp index 58ec844b..3b627ff3 100644 --- a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp +++ b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp @@ -94,7 +94,7 @@ bool QSimulatorSensorGestureRecognizer::isActive() QString QSimulatorSensorGestureRecognizer::id() const { - return QString("QtSensors.simulator"); + return QString("QtSensors.emulator"); } void QSimulatorSensorGestureRecognizer::timeout() diff --git a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h index 77b09941..a301a5f8 100644 --- a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h +++ b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h @@ -63,9 +63,6 @@ public: bool stop(); bool isActive(); -Q_SIGNALS: - void simulator(); - private slots: void timeout(); void sensorGestureDetected(); diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h index 44ec8721..9fe91bdd 100644 --- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h +++ b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h @@ -60,7 +60,7 @@ public: QStringList gestureSignals() const; QStringList supportedIds() const; - QString name() const { return "SimulatorGestures"; } + QString name() const { return "EmulatorGestures"; } }; #endif // QSIMULATORSENSORGESTUREPLUGIN_H diff --git a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp b/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp index 96edcee3..c9db8f9f 100644 --- a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp +++ b/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp @@ -53,7 +53,8 @@ Q_GLOBAL_STATIC(QString, qtSensorGestureData) SensorGesturesConnection::SensorGesturesConnection(QObject *parent) : QObject(parent) { - mConnection = new Connection(Connection::Client, "QtSimulator_Mobility_ServerName1.3.0.0", 0xbeef+1, Version(1,0,0,0), this); + mConnection = new Connection(Connection::Client, "QtSimulator_Mobility_ServerName1.3.0.0", + 0xbeef+1, Version(1,0,0,0), this); mWorker = mConnection->connectToServer(Connection::simulatorHostName(true), 0xbeef+1); if (!mWorker) { |