summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-16 14:39:29 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-16 14:39:29 +0200
commitb11d8d673ba36ab22c0d7a40ea53d57f284cca13 (patch)
treef370841deac0b5516fa458a910f508d592a6cc36 /src/imports
parent478ec8819427f783cba05601779cfce9dba1d55c (diff)
parenta16f81a365b7d9a6629b04bd298a3b45fc1b7628 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/sensors/qmlaccelerometer.h2
-rw-r--r--src/imports/sensors/qmlsensor.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h
index 7a9a4cd0..3c126d0f 100644
--- a/src/imports/sensors/qmlaccelerometer.h
+++ b/src/imports/sensors/qmlaccelerometer.h
@@ -69,7 +69,7 @@ public:
void setAccelerationMode(AccelerationMode accelerationMode);
signals:
- void accelerationModeChanged(AccelerationMode accelerationMode);
+ Q_REVISION(1) void accelerationModeChanged(AccelerationMode accelerationMode);
private:
QSensor *sensor() const Q_DECL_OVERRIDE;
diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h
index f72234ae..64568d8d 100644
--- a/src/imports/sensors/qmlsensor.h
+++ b/src/imports/sensors/qmlsensor.h
@@ -153,13 +153,13 @@ Q_SIGNALS:
void descriptionChanged();
void errorChanged();
void alwaysOnChanged();
- void skipDuplicatesChanged(bool skipDuplicates);
- void axesOrientationModeChanged(AxesOrientationMode axesOrientationMode);
- void currentOrientationChanged(int currentOrientation);
- void userOrientationChanged(int userOrientation);
- void maxBufferSizeChanged(int maxBufferSize);
- void efficientBufferSizeChanged(int efficientBufferSize);
- void bufferSizeChanged(int bufferSize);
+ Q_REVISION(1) void skipDuplicatesChanged(bool skipDuplicates);
+ Q_REVISION(1) void axesOrientationModeChanged(AxesOrientationMode axesOrientationMode);
+ Q_REVISION(1) void currentOrientationChanged(int currentOrientation);
+ Q_REVISION(1) void userOrientationChanged(int userOrientation);
+ Q_REVISION(1) void maxBufferSizeChanged(int maxBufferSize);
+ Q_REVISION(1) void efficientBufferSizeChanged(int efficientBufferSize);
+ Q_REVISION(1) void bufferSizeChanged(int bufferSize);
protected:
virtual QSensor *sensor() const = 0;