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/qproximitysensor.h | |
parent | 6e7d77219a583e9a9d8ff14f32f9400543cd2add (diff) | |
parent | 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I43577461af4808e48de9b229843f324f195ae3d0
Diffstat (limited to 'src/sensors/qproximitysensor.h')
-rw-r--r-- | src/sensors/qproximitysensor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 1f3a3cf5..33cd4b2b 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QProximitySensor : public QSensor { Q_OBJECT public: - explicit QProximitySensor(QObject *parent = 0); + explicit QProximitySensor(QObject *parent = Q_NULLPTR); virtual ~QProximitySensor(); QProximityReading *reading() const; static char const * const type; |