diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:34 +0200 |
| commit | 90f43c450db8cad9f10d86c006f251dad91a4492 (patch) | |
| tree | 2f4f02df3d6a121645714e73c762308772ab46bc /src/sensors/qaccelerometer.h | |
| parent | 6e7d77219a583e9a9d8ff14f32f9400543cd2add (diff) | |
| parent | 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 (diff) | |
| download | qtsensors-90f43c450db8cad9f10d86c006f251dad91a4492.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I43577461af4808e48de9b229843f324f195ae3d0
Diffstat (limited to 'src/sensors/qaccelerometer.h')
| -rw-r--r-- | src/sensors/qaccelerometer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index 24ccb34..1911e5f 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -81,7 +81,7 @@ class Q_SENSORS_EXPORT QAccelerometer : public QSensor Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode NOTIFY accelerationModeChanged) public: - explicit QAccelerometer(QObject *parent = 0); + explicit QAccelerometer(QObject *parent = Q_NULLPTR); virtual ~QAccelerometer(); // Keep this enum in sync with QmlAccelerometer::AccelerationMode |