diff options
Diffstat (limited to 'src/sensors')
26 files changed, 37 insertions, 37 deletions
diff --git a/src/sensors/doc/images/cubehouse.png b/src/sensors/doc/images/cubehouse.png Binary files differindex e3ff7fa5..dac833e3 100644 --- a/src/sensors/doc/images/cubehouse.png +++ b/src/sensors/doc/images/cubehouse.png diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 8362703d..4de1b7e2 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -85,7 +85,7 @@ <td nowrap="nowrap">Ambient Light Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> @@ -175,7 +175,7 @@ <td nowrap="nowrap">Orientation Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> @@ -205,7 +205,7 @@ <td nowrap="nowrap">Rotation Sensor</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> @@ -225,7 +225,7 @@ <td nowrap="nowrap">Tilt Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index 46d7e77c..af3fbba5 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -52,7 +52,7 @@ class Q_SENSORS_EXPORT QSensorGesture : public QObject { //Do not use Q_OBJECT here public: - QSensorGesture(const QStringList &ids, QObject *parent = 0); + explicit QSensorGesture(const QStringList &ids, QObject *parent = Q_NULLPTR); ~QSensorGesture(); bool isActive(); diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h index cda4e18b..ee7e77aa 100644 --- a/src/sensors/gestures/qsensorgesturemanager.h +++ b/src/sensors/gestures/qsensorgesturemanager.h @@ -49,7 +49,7 @@ class Q_SENSORS_EXPORT QSensorGestureManager : public QObject Q_DECLARE_PRIVATE(QSensorGestureManager) public: - explicit QSensorGestureManager(QObject *parent = 0); + explicit QSensorGestureManager(QObject *parent = Q_NULLPTR); ~QSensorGestureManager(); diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h index de6ad022..c8e406a6 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.h +++ b/src/sensors/gestures/qsensorgesturerecognizer.h @@ -47,7 +47,7 @@ class Q_SENSORS_EXPORT QSensorGestureRecognizer : public QObject { Q_OBJECT public: - QSensorGestureRecognizer(QObject *parent = 0); + explicit QSensorGestureRecognizer(QObject *parent = Q_NULLPTR); virtual ~QSensorGestureRecognizer(); virtual QString id() const = 0; diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index 9f8cd8c9..2db65c90 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -75,7 +75,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 diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h index 46be7695..85b353e8 100644 --- a/src/sensors/qaltimeter.h +++ b/src/sensors/qaltimeter.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QAltimeter : public QSensor { Q_OBJECT public: - explicit QAltimeter(QObject *parent = 0); + explicit QAltimeter(QObject *parent = Q_NULLPTR); ~QAltimeter(); QAltimeterReading *reading() const; static char const * const type; diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h index 37f37234..53182f94 100644 --- a/src/sensors/qambientlightsensor.h +++ b/src/sensors/qambientlightsensor.h @@ -72,7 +72,7 @@ class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor { Q_OBJECT public: - explicit QAmbientLightSensor(QObject *parent = 0); + explicit QAmbientLightSensor(QObject *parent = Q_NULLPTR); virtual ~QAmbientLightSensor(); QAmbientLightReading *reading() const; static char const * const type; diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h index 5dabac5d..93f3efd3 100644 --- a/src/sensors/qambienttemperaturesensor.h +++ b/src/sensors/qambienttemperaturesensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor { Q_OBJECT public: - explicit QAmbientTemperatureSensor(QObject *parent = 0); + explicit QAmbientTemperatureSensor(QObject *parent = Q_NULLPTR); ~QAmbientTemperatureSensor(); QAmbientTemperatureReading *reading() const; static char const * const type; diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index d4ad19fb..46075a79 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -50,7 +50,7 @@ IMPLEMENT_READING(QCompassReading) \section2 QCompassReading Units The compass returns the azimuth of the device as degrees from magnetic north in a clockwise direction based on the top of the device, - as defined by QPlatformScreen::nativeOrientation. + as defined by QScreen::nativeOrientation. There is also a value to indicate the calibration status of the device. If the device is not calibrated the azimuth may not be accurate. @@ -92,7 +92,7 @@ void QCompassReading::setAzimuth(qreal azimuth) \brief the calibration level of the reading. Measured as a value from 0 to 1 with higher values being better. - \sa {QCompassReading Units}, {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor} + \sa {QCompassReading Units} */ qreal QCompassReading::calibrationLevel() const diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index acb76536..1069b6ce 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -66,7 +66,7 @@ class Q_SENSORS_EXPORT QCompass : public QSensor { Q_OBJECT public: - explicit QCompass(QObject *parent = 0); + explicit QCompass(QObject *parent = Q_NULLPTR); virtual ~QCompass(); QCompassReading *reading() const; static char const * const type; diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h index bcc1e73a..e1819233 100644 --- a/src/sensors/qdistancesensor.h +++ b/src/sensors/qdistancesensor.h @@ -62,7 +62,7 @@ class Q_SENSORS_EXPORT QDistanceSensor : public QSensor { Q_OBJECT public: - explicit QDistanceSensor(QObject *parent = 0); + explicit QDistanceSensor(QObject *parent = Q_NULLPTR); ~QDistanceSensor(); QDistanceReading *reading() const; static char const * const type; diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h index 59ea405e..202503d5 100644 --- a/src/sensors/qgyroscope.h +++ b/src/sensors/qgyroscope.h @@ -70,7 +70,7 @@ class Q_SENSORS_EXPORT QGyroscope : public QSensor { Q_OBJECT public: - explicit QGyroscope(QObject *parent = 0); + explicit QGyroscope(QObject *parent = Q_NULLPTR); virtual ~QGyroscope(); QGyroscopeReading *reading() const; static char const * const type; diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h index b201a61c..6f9d1d89 100644 --- a/src/sensors/qholstersensor.h +++ b/src/sensors/qholstersensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QHolsterSensor : public QSensor { Q_OBJECT public: - explicit QHolsterSensor(QObject *parent = 0); + explicit QHolsterSensor(QObject *parent = Q_NULLPTR); ~QHolsterSensor(); QHolsterReading *reading() const; static char const * const type; diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h index 32f0c880..f81f1163 100644 --- a/src/sensors/qirproximitysensor.h +++ b/src/sensors/qirproximitysensor.h @@ -62,7 +62,7 @@ class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor { Q_OBJECT public: - explicit QIRProximitySensor(QObject *parent = 0); + explicit QIRProximitySensor(QObject *parent = Q_NULLPTR); virtual ~QIRProximitySensor(); QIRProximityReading *reading() const; static char const * const type; diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h index fdebeb1d..b56b2840 100644 --- a/src/sensors/qlightsensor.h +++ b/src/sensors/qlightsensor.h @@ -65,7 +65,7 @@ class Q_SENSORS_EXPORT QLightSensor : public QSensor Q_OBJECT Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged) public: - explicit QLightSensor(QObject *parent = 0); + explicit QLightSensor(QObject *parent = Q_NULLPTR); virtual ~QLightSensor(); QLightReading *reading() const; static char const * const type; diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index 8a0c6d2a..8020c02d 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -77,7 +77,7 @@ class Q_SENSORS_EXPORT QMagnetometer : public QSensor Q_OBJECT Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged) public: - explicit QMagnetometer(QObject *parent = 0); + explicit QMagnetometer(QObject *parent = Q_NULLPTR); virtual ~QMagnetometer(); QMagnetometerReading *reading() const; static char const * const type; diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index c92f64f9..badb67e9 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -73,7 +73,7 @@ class Q_SENSORS_EXPORT QOrientationSensor : public QSensor { Q_OBJECT public: - explicit QOrientationSensor(QObject *parent = 0); + explicit QOrientationSensor(QObject *parent = Q_NULLPTR); virtual ~QOrientationSensor(); QOrientationReading *reading() const; static char const * const type; diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h index a9bfaaaf..1a907c06 100644 --- a/src/sensors/qpressuresensor.h +++ b/src/sensors/qpressuresensor.h @@ -65,7 +65,7 @@ class Q_SENSORS_EXPORT QPressureSensor : public QSensor { Q_OBJECT public: - explicit QPressureSensor(QObject *parent = 0); + explicit QPressureSensor(QObject *parent = Q_NULLPTR); ~QPressureSensor(); QPressureReading *reading() const; static char const * const type; diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index d44a0505..a55c3d7f 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -62,7 +62,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; diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index 3b21493b..1da85edd 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -70,7 +70,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; diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index a5f78f9c..cb86e53b 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -110,7 +110,7 @@ public: UserOrientation }; - explicit QSensor(const QByteArray &type, QObject *parent = 0); + explicit QSensor(const QByteArray &type, QObject *parent = Q_NULLPTR); virtual ~QSensor(); QByteArray identifier() const; @@ -201,7 +201,7 @@ Q_SIGNALS: void bufferSizeChanged(int bufferSize); protected: - explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = 0); + explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = Q_NULLPTR); QSensorBackend *backend() const; private: @@ -255,7 +255,7 @@ private: #define DECLARE_READING_D(classname, pclassname)\ public:\ - classname(QObject *parent = 0);\ + classname(QObject *parent = Q_NULLPTR);\ virtual ~classname();\ void copyValuesFrom(QSensorReading *other);\ private:\ @@ -266,7 +266,7 @@ private: #define IMPLEMENT_READING_D(classname, pclassname)\ classname::classname(QObject *parent)\ - : QSensorReading(parent, 0)\ + : QSensorReading(parent, Q_NULLPTR)\ , d(new pclassname)\ {}\ classname::~classname() {}\ diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index 460d318f..753cab9e 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -45,7 +45,7 @@ class Q_SENSORS_EXPORT QSensorBackend : public QObject { Q_OBJECT public: - explicit QSensorBackend(QSensor *sensor, QObject *parent = 0); + explicit QSensorBackend(QSensor *sensor, QObject *parent = Q_NULLPTR); virtual ~QSensorBackend(); virtual void start() = 0; diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index ada6a658..0d6b70eb 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -87,7 +87,7 @@ class Q_SENSORS_EXPORT QTapSensor : public QSensor Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents NOTIFY returnDoubleTapEventsChanged) public: - explicit QTapSensor(QObject *parent = 0); + explicit QTapSensor(QObject *parent = Q_NULLPTR); virtual ~QTapSensor(); QTapReading *reading() const; static char const * const type; diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h index 6aac3217..cbc1ba37 100644 --- a/src/sensors/qtiltsensor.h +++ b/src/sensors/qtiltsensor.h @@ -68,7 +68,7 @@ class Q_SENSORS_EXPORT QTiltSensor : public QSensor { Q_OBJECT public: - explicit QTiltSensor(QObject *parent = 0); + explicit QTiltSensor(QObject *parent = Q_NULLPTR); ~QTiltSensor(); QTiltReading *reading() const; static char const * const type; diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index a7f60e18..9eeceb8c 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -7,7 +7,7 @@ CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG qtHaveModule(simulator) { DEFINES += SIMULATOR_BUILD - QT += simulator + QT_FOR_PRIVATE += simulator } QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf @@ -18,11 +18,6 @@ ANDROID_JAR_DEPENDENCIES = \ jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_LIB_DEPENDENCIES = \ plugins/sensors/libqtsensors_android.so -MODULE_PLUGIN_TYPES = \ - sensors \ - sensorgestures - -load(qt_module) PUBLIC_HEADERS += \ qsensorbackend.h\ @@ -87,3 +82,8 @@ for(s,SENSORS) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS + +MODULE_PLUGIN_TYPES = \ + sensors \ + sensorgestures +load(qt_module) |