summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/sensors/accelbubble/doc/images/accelbubble.pngbin5181 -> 5025 bytes
-rw-r--r--examples/sensors/grue/doc/images/qtsensors-examples-grue.pngbin12278 -> 7511 bytes
-rw-r--r--examples/sensors/grue/grue.pngbin11207 -> 9319 bytes
-rw-r--r--examples/sensors/maze/components/images/button_background_pressed.pngbin334 -> 228 bytes
-rw-r--r--examples/sensors/maze/content/00.pngbin186 -> 70 bytes
-rw-r--r--examples/sensors/maze/content/01.pngbin708 -> 540 bytes
-rw-r--r--examples/sensors/maze/content/cheese.pngbin317 -> 156 bytes
-rw-r--r--examples/sensors/maze/content/start.pngbin677 -> 505 bytes
-rw-r--r--examples/sensors/qmlqtsensors/components/images/button_background_pressed.pngbin334 -> 228 bytes
-rw-r--r--examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.pngbin39873 -> 39820 bytes
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensors.pro9
-rw-r--r--src/plugins/sensorgestures/shake/shake.pro9
-rw-r--r--src/plugins/sensors/android/src/src.pro9
-rw-r--r--src/plugins/sensors/dummy/dummy.pro8
-rw-r--r--src/plugins/sensors/generic/generic.pro8
-rw-r--r--src/plugins/sensors/ios/ios.pro8
-rw-r--r--src/plugins/sensors/linux/linux.pro8
-rw-r--r--src/plugins/sensors/sensorfw/sensorfw.pro8
-rw-r--r--src/plugins/sensors/simulator/simulator.pro8
-rw-r--r--src/plugins/sensors/winrt/winrt.pro8
-rw-r--r--src/sensors/doc/images/cubehouse.pngbin39408 -> 39346 bytes
-rw-r--r--src/sensors/doc/src/compatmap.qdoc8
-rw-r--r--src/sensors/gestures/qsensorgesture.h2
-rw-r--r--src/sensors/gestures/qsensorgesturemanager.h2
-rw-r--r--src/sensors/gestures/qsensorgesturerecognizer.h2
-rw-r--r--src/sensors/qaccelerometer.h2
-rw-r--r--src/sensors/qaltimeter.h2
-rw-r--r--src/sensors/qambientlightsensor.h2
-rw-r--r--src/sensors/qambienttemperaturesensor.h2
-rw-r--r--src/sensors/qcompass.cpp4
-rw-r--r--src/sensors/qcompass.h2
-rw-r--r--src/sensors/qdistancesensor.h2
-rw-r--r--src/sensors/qgyroscope.h2
-rw-r--r--src/sensors/qholstersensor.h2
-rw-r--r--src/sensors/qirproximitysensor.h2
-rw-r--r--src/sensors/qlightsensor.h2
-rw-r--r--src/sensors/qmagnetometer.h2
-rw-r--r--src/sensors/qorientationsensor.h2
-rw-r--r--src/sensors/qpressuresensor.h2
-rw-r--r--src/sensors/qproximitysensor.h2
-rw-r--r--src/sensors/qrotationsensor.h2
-rw-r--r--src/sensors/qsensor.h8
-rw-r--r--src/sensors/qsensorbackend.h2
-rw-r--r--src/sensors/qtapsensor.h2
-rw-r--r--src/sensors/qtiltsensor.h2
-rw-r--r--src/sensors/sensors.pro12
-rw-r--r--tests/auto/qsensorgestures/plugins/test1/test1.pro10
47 files changed, 83 insertions, 84 deletions
diff --git a/examples/sensors/accelbubble/doc/images/accelbubble.png b/examples/sensors/accelbubble/doc/images/accelbubble.png
index 84e876d..ad4cfc0 100644
--- a/examples/sensors/accelbubble/doc/images/accelbubble.png
+++ b/examples/sensors/accelbubble/doc/images/accelbubble.png
Binary files differ
diff --git a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
index 81b3725..f434827 100644
--- a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
+++ b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png
Binary files differ
diff --git a/examples/sensors/grue/grue.png b/examples/sensors/grue/grue.png
index f0b070b..2727d39 100644
--- a/examples/sensors/grue/grue.png
+++ b/examples/sensors/grue/grue.png
Binary files differ
diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png
index 149529e..e0ba0e7 100644
--- a/examples/sensors/maze/components/images/button_background_pressed.png
+++ b/examples/sensors/maze/components/images/button_background_pressed.png
Binary files differ
diff --git a/examples/sensors/maze/content/00.png b/examples/sensors/maze/content/00.png
index ab29a62..2522be5 100644
--- a/examples/sensors/maze/content/00.png
+++ b/examples/sensors/maze/content/00.png
Binary files differ
diff --git a/examples/sensors/maze/content/01.png b/examples/sensors/maze/content/01.png
index 0e70d1b..6146b20 100644
--- a/examples/sensors/maze/content/01.png
+++ b/examples/sensors/maze/content/01.png
Binary files differ
diff --git a/examples/sensors/maze/content/cheese.png b/examples/sensors/maze/content/cheese.png
index ecef450..c737b9d 100644
--- a/examples/sensors/maze/content/cheese.png
+++ b/examples/sensors/maze/content/cheese.png
Binary files differ
diff --git a/examples/sensors/maze/content/start.png b/examples/sensors/maze/content/start.png
index 698c0b1..581b8c9 100644
--- a/examples/sensors/maze/content/start.png
+++ b/examples/sensors/maze/content/start.png
Binary files differ
diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
index 149529e..e0ba0e7 100644
--- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
+++ b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
Binary files differ
diff --git a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
index 0976b9f..888fc3c 100644
--- a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
+++ b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-explorer.png
Binary files differ
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index 3f8df03..44f18ff 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
@@ -1,11 +1,6 @@
TARGET = qtsensorgestures_plugin
QT = core sensors
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QtSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
# Input
HEADERS += qtsensorgestureplugin.h \
qcoversensorgesturerecognizer.h \
@@ -36,3 +31,7 @@ SOURCES += qtsensorgestureplugin.cpp \
OTHER_FILES += \
plugin.json
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QtSensorGesturePlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
index d7d8f92..efa2a0c 100644
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ b/src/plugins/sensorgestures/shake/shake.pro
@@ -1,11 +1,6 @@
TARGET = qtsensorgestures_shakeplugin
QT = core sensors
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
# Input
HEADERS += qshakesensorgestureplugin.h \
qshakerecognizer.h
@@ -15,3 +10,7 @@ SOURCES += qshakesensorgestureplugin.cpp \
OTHER_FILES += \
plugin.json
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)
diff --git a/src/plugins/sensors/android/src/src.pro b/src/plugins/sensors/android/src/src.pro
index 23a6bea..8366944 100644
--- a/src/plugins/sensors/android/src/src.pro
+++ b/src/plugins/sensors/android/src/src.pro
@@ -1,9 +1,6 @@
TARGET = qtsensors_android
-QT = sensors core
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = QCounterGesturePlugin
-load(qt_plugin)
+QT = sensors core
# STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp
# Yes, the plugin imports itself statically
@@ -36,3 +33,7 @@ SOURCES = \
androidlight.cpp
OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = QCounterGesturePlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro
index 93f54dc..b4ef2fd 100644
--- a/src/plugins/sensors/dummy/dummy.pro
+++ b/src/plugins/sensors/dummy/dummy.pro
@@ -1,10 +1,6 @@
TARGET = qtsensors_dummy
QT = sensors core
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = dummySensorPlugin
-load(qt_plugin)
-
HEADERS += dummycommon.h\
dummyaccelerometer.h\
dummylightsensor.h
@@ -17,3 +13,7 @@ SOURCES += dummycommon.cpp\
OTHER_FILES = plugin.json
unix:!mac:!qnx:!android:LIBS+=-lrt
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = dummySensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro
index cdb9300..cf87ccf 100644
--- a/src/plugins/sensors/generic/generic.pro
+++ b/src/plugins/sensors/generic/generic.pro
@@ -1,10 +1,6 @@
TARGET = qtsensors_generic
QT = core sensors
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = genericSensorPlugin
-load(qt_plugin)
-
HEADERS += generictiltsensor.h
SOURCES += main.cpp\
@@ -27,3 +23,7 @@ DEFINES += QTSENSORS_GENERICORIENTATIONSENSOR QTSENSORS_GENERICALSSENSOR
}
OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = genericSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/ios/ios.pro b/src/plugins/sensors/ios/ios.pro
index 4197b14..17ff009 100644
--- a/src/plugins/sensors/ios/ios.pro
+++ b/src/plugins/sensors/ios/ios.pro
@@ -1,10 +1,6 @@
TARGET = qtsensors_ios
QT = core sensors
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = IOSSensorPlugin
-load(qt_plugin)
-
OTHER_FILES = plugin.json
HEADERS += iosaccelerometer.h \
@@ -23,3 +19,7 @@ OBJECTIVE_SOURCES += main.mm \
iosproximitysensor.mm
LIBS += -framework UIKit -framework CoreMotion -framework CoreLocation
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = IOSSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/linux/linux.pro b/src/plugins/sensors/linux/linux.pro
index 636bd1b..33706e7 100644
--- a/src/plugins/sensors/linux/linux.pro
+++ b/src/plugins/sensors/linux/linux.pro
@@ -1,13 +1,13 @@
TARGET = qtsensors_linuxsys
QT = core sensors
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = LinuxSensorPlugin
-load(qt_plugin)
-
OTHER_FILES = plugin.json
!android:LIBS += -lrt
HEADERS += linuxsysaccelerometer.h
SOURCES += linuxsysaccelerometer.cpp \
main.cpp
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = LinuxSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro
index 6c1408b..b30b362 100644
--- a/src/plugins/sensors/sensorfw/sensorfw.pro
+++ b/src/plugins/sensors/sensorfw/sensorfw.pro
@@ -1,10 +1,6 @@
TARGET = qtsensors_sensorfw
QT = core sensors network dbus
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = sensorfwSensorPlugin
-load(qt_plugin)
-
include(sensorfw.pri)
@@ -16,3 +12,7 @@ CONFIGFILES.path = /etc/xdg/QtProject/
INSTALLS += CONFIGFILES
OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = sensorfwSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro
index b110137..ac8ea50 100644
--- a/src/plugins/sensors/simulator/simulator.pro
+++ b/src/plugins/sensors/simulator/simulator.pro
@@ -1,9 +1,5 @@
TARGET = qtsensors_simulator
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = SimulatorSensorPlugin
-load(qt_plugin)
-
QT=core gui network sensors simulator
HEADERS += \
@@ -30,3 +26,7 @@ SOURCES += \
main.cpp
OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = SimulatorSensorPlugin
+load(qt_plugin)
diff --git a/src/plugins/sensors/winrt/winrt.pro b/src/plugins/sensors/winrt/winrt.pro
index 67ae530..21996fd 100644
--- a/src/plugins/sensors/winrt/winrt.pro
+++ b/src/plugins/sensors/winrt/winrt.pro
@@ -1,10 +1,6 @@
TARGET = qtsensors_winrt
QT = sensors core core_private
-PLUGIN_TYPE = sensors
-PLUGIN_CLASS_NAME = WinRtSensorPlugin
-load(qt_plugin)
-
HEADERS += \
winrtaccelerometer.h \
winrtambientlightsensor.h \
@@ -25,3 +21,7 @@ SOURCES += \
winrtgyroscope.cpp
OTHER_FILES = plugin.json
+
+PLUGIN_TYPE = sensors
+PLUGIN_CLASS_NAME = WinRtSensorPlugin
+load(qt_plugin)
diff --git a/src/sensors/doc/images/cubehouse.png b/src/sensors/doc/images/cubehouse.png
index e3ff7fa..dac833e 100644
--- a/src/sensors/doc/images/cubehouse.png
+++ b/src/sensors/doc/images/cubehouse.png
Binary files differ
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index f043195..399bcec 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="green"></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 0132e31..880be69 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -58,7 +58,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 d9d7d6b..1ddc84c 100644
--- a/src/sensors/gestures/qsensorgesturemanager.h
+++ b/src/sensors/gestures/qsensorgesturemanager.h
@@ -55,7 +55,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 1a58ac2..2718198 100644
--- a/src/sensors/gestures/qsensorgesturerecognizer.h
+++ b/src/sensors/gestures/qsensorgesturerecognizer.h
@@ -53,7 +53,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 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
diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h
index 67fd617..0d609b4 100644
--- a/src/sensors/qaltimeter.h
+++ b/src/sensors/qaltimeter.h
@@ -67,7 +67,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 2e2bc4d..f9f7d1b 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -78,7 +78,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 534ff04..181c611 100644
--- a/src/sensors/qambienttemperaturesensor.h
+++ b/src/sensors/qambienttemperaturesensor.h
@@ -67,7 +67,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 d952775..5177a17 100644
--- a/src/sensors/qcompass.cpp
+++ b/src/sensors/qcompass.cpp
@@ -56,7 +56,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.
@@ -98,7 +98,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 a6ed41f..169f38c 100644
--- a/src/sensors/qcompass.h
+++ b/src/sensors/qcompass.h
@@ -72,7 +72,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 6faeb4a..499a695 100644
--- a/src/sensors/qdistancesensor.h
+++ b/src/sensors/qdistancesensor.h
@@ -68,7 +68,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 24fcde0..dc54179 100644
--- a/src/sensors/qgyroscope.h
+++ b/src/sensors/qgyroscope.h
@@ -76,7 +76,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 474f694..253e05b 100644
--- a/src/sensors/qholstersensor.h
+++ b/src/sensors/qholstersensor.h
@@ -67,7 +67,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 8516399..153741c 100644
--- a/src/sensors/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
@@ -68,7 +68,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 9d30af6..0b16b46 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -71,7 +71,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 585d09e..25ad040 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -83,7 +83,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 846092e..703abb3 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -79,7 +79,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 8426871..5deb16b 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -71,7 +71,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 1f3a3cf..33cd4b2 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;
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h
index a8148b2..de2053b 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;
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index a02cc27..cf8de76 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -116,7 +116,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;
@@ -207,7 +207,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:
@@ -261,7 +261,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:\
@@ -272,7 +272,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 14484f0..3837c14 100644
--- a/src/sensors/qsensorbackend.h
+++ b/src/sensors/qsensorbackend.h
@@ -51,7 +51,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 082a030..d6207a1 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -93,7 +93,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 6d25f3d..6f83a34 100644
--- a/src/sensors/qtiltsensor.h
+++ b/src/sensors/qtiltsensor.h
@@ -74,7 +74,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 a7f60e1..9eeceb8 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)
diff --git a/tests/auto/qsensorgestures/plugins/test1/test1.pro b/tests/auto/qsensorgestures/plugins/test1/test1.pro
index f35af0d..5f89068 100644
--- a/tests/auto/qsensorgestures/plugins/test1/test1.pro
+++ b/tests/auto/qsensorgestures/plugins/test1/test1.pro
@@ -2,11 +2,6 @@ TARGET = qtsensorgestures_testplugin1
QT += sensors sensorgestures
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
-
# Input
HEADERS += qtestsensorgestureplugindup_p.h \
qtestrecognizerdup.h \
@@ -16,3 +11,8 @@ SOURCES += qtestsensorgestureplugindup.cpp \
qtest2recognizerduo.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = sensorgestures
+PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin
+PLUGIN_EXTENDS = -
+load(qt_plugin)