diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
| commit | f8e256271f919c36c8d97eae27b1d11678294e70 (patch) | |
| tree | 774152d663a540dbf0ceb2f1ccb8385842a6e471 /src/sensors/qrotationsensor.h | |
| parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
| parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'src/sensors/qrotationsensor.h')
| -rw-r--r-- | src/sensors/qrotationsensor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index a8148b29..de2053bb 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -76,7 +76,7 @@ class Q_SENSORS_EXPORT QRotationSensor : public QSensor Q_OBJECT Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged) public: - explicit QRotationSensor(QObject *parent = 0); + explicit QRotationSensor(QObject *parent = Q_NULLPTR); virtual ~QRotationSensor(); QRotationReading *reading() const; static char const * const type; |