summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp2
-rw-r--r--src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h3
-rw-r--r--src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h2
-rw-r--r--src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp3
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) {