diff options
32 files changed, 70 insertions, 32 deletions
diff --git a/.qmake.conf b/.qmake.conf index b5454e50..1ed62c5a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.5 +MODULE_VERSION = 5.13.1 diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0 new file mode 100644 index 00000000..cdea8819 --- /dev/null +++ b/dist/changes-5.13.0 @@ -0,0 +1,24 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Android * +**************************************************************************** + + - Rewrite Qt Android Sensors using NDK API. + - Raise minimal Android sdk version to v21 + diff --git a/examples/sensors/accelbubble/accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml index f26179ff..8bd036ff 100644 --- a/examples/sensors/accelbubble/accelbubble.qml +++ b/examples/sensors/accelbubble/accelbubble.qml @@ -101,10 +101,10 @@ ApplicationWindow { } function calcPitch(x,y,z) { - return -Math.atan2(y, Math.sqrt(x * x + z * z)) * mainWindow.radians_to_degrees; + return -Math.atan2(y, Math.hypot(x, z)) * mainWindow.radians_to_degrees; } function calcRoll(x,y,z) { - return -Math.atan2(x, Math.sqrt(y * y + z * z)) * mainWindow.radians_to_degrees; + return -Math.atan2(x, Math.hypot(y, z)) * mainWindow.radians_to_degrees; } Image { diff --git a/examples/sensors/accelbubble/android/AndroidManifest.xml b/examples/sensors/accelbubble/android/AndroidManifest.xml index f3104443..4627978e 100644 --- a/examples/sensors/accelbubble/android/AndroidManifest.xml +++ b/examples/sensors/accelbubble/android/AndroidManifest.xml @@ -65,7 +65,7 @@ </application> - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. diff --git a/examples/sensors/maze/android/AndroidManifest.xml b/examples/sensors/maze/android/AndroidManifest.xml index de787fad..bfb126a6 100644 --- a/examples/sensors/maze/android/AndroidManifest.xml +++ b/examples/sensors/maze/android/AndroidManifest.xml @@ -42,7 +42,7 @@ <!-- Background running --> </activity> </application> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index d16b2be6..b78e63c6 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtSensors 5.12' +// 'qmlplugindump -nonrelocatable QtSensors 5.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QmlAccelerometer" prototype: "QmlSensor" diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp index 84eea6f7..0389af4a 100644 --- a/src/imports/sensors/qmlsensor.cpp +++ b/src/imports/sensors/qmlsensor.cpp @@ -399,7 +399,8 @@ void QmlSensor::setBufferSize(int bufferSize) /*! \qmlmethod bool Sensor::start() - Start retrieving values from the sensor. Returns true if the sensor was started, false otherwise. + Start retrieving values from the sensor. Returns true if the sensor + was started, false otherwise. Please see QSensor::start() for information. */ @@ -413,6 +414,7 @@ bool QmlSensor::start() /*! \qmlmethod bool Sensor::stop() Stop retrieving values from the sensor. + Returns true if the sensor was stopped, false otherwise. Please see QSensor::stop() for information. */ diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp index d9a51873..2e7f104c 100644 --- a/src/imports/sensors/qmlsensorgesture.cpp +++ b/src/imports/sensors/qmlsensorgesture.cpp @@ -211,7 +211,7 @@ void QmlSensorGesture::setEnabled(bool value) /*! \qmlsignal SensorGesture::detected(string gesture) This signal is emitted whenever a gesture is detected. - The gesture parameter contains the gesture that was detected. + The \a gesture parameter contains the gesture that was detected. The corresponding handler is \c onDetected. */ diff --git a/src/plugins/sensors/ios/iosproximitysensor.mm b/src/plugins/sensors/ios/iosproximitysensor.mm index eae85608..e596aa5b 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.mm +++ b/src/plugins/sensors/ios/iosproximitysensor.mm @@ -49,11 +49,12 @@ int IOSProximitySensor::s_startCount = 0; @interface ProximitySensorCallback : NSObject { - IOSProximitySensor *m_iosProximitySensor; } @end -@implementation ProximitySensorCallback +@implementation ProximitySensorCallback { + IOSProximitySensor *m_iosProximitySensor; +} - (id)initWithQIOSProximitySensor:(IOSProximitySensor *)iosProximitySensor { diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf index 8b9b95d0..0845e707 100644 --- a/src/sensors/doc/qtsensors.qdocconf +++ b/src/sensors/doc/qtsensors.qdocconf @@ -1,5 +1,6 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtsensors.qdocconf) project = QtSensors description = Qt Sensors Reference Documentation diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index dd95b3bd..de727954 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -74,6 +74,7 @@ public: private: QSensorGesturePrivate * d_ptr; + // ### fixme: Qt 6: Make public to enable Qt for Python bindings private: // Pretend to be a Q_OBJECT const QMetaObject *metaObject() const override; diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp index baf414e1..9254da28 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.cpp +++ b/src/sensors/gestures/qsensorgesturerecognizer.cpp @@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE /*! \fn QSensorGestureRecognizer::detected(const QString &gestureId) - Signals when the \a gestureId gesture has been recognized. + Signals when the gesture with id \a &gestureId been recognized. */ class QSensorGestureRecognizerPrivate diff --git a/src/sensors/qaccelerometer.cpp b/src/sensors/qaccelerometer.cpp index bb65d80b..4f89f997 100644 --- a/src/sensors/qaccelerometer.cpp +++ b/src/sensors/qaccelerometer.cpp @@ -276,6 +276,6 @@ QAccelerometerReading *QAccelerometer::reading() const \since 5.1 */ -#include "moc_qaccelerometer.cpp" QT_END_NAMESPACE +#include "moc_qaccelerometer.cpp" diff --git a/src/sensors/qaltimeter.cpp b/src/sensors/qaltimeter.cpp index 1a986169..7092870d 100644 --- a/src/sensors/qaltimeter.cpp +++ b/src/sensors/qaltimeter.cpp @@ -146,5 +146,6 @@ QAltimeterReading *QAltimeter::reading() const return static_cast<QAltimeterReading*>(QSensor::reading()); } -#include "moc_qaltimeter.cpp" QT_END_NAMESPACE + +#include "moc_qaltimeter.cpp" diff --git a/src/sensors/qambientlightsensor.cpp b/src/sensors/qambientlightsensor.cpp index 92b17c8c..dd86ae2e 100644 --- a/src/sensors/qambientlightsensor.cpp +++ b/src/sensors/qambientlightsensor.cpp @@ -178,6 +178,6 @@ QAmbientLightReading *QAmbientLightSensor::reading() const return static_cast<QAmbientLightReading*>(QSensor::reading()); } -#include "moc_qambientlightsensor.cpp" QT_END_NAMESPACE +#include "moc_qambientlightsensor.cpp" diff --git a/src/sensors/qambienttemperaturesensor.cpp b/src/sensors/qambienttemperaturesensor.cpp index 6759e9f3..53cce0a9 100644 --- a/src/sensors/qambienttemperaturesensor.cpp +++ b/src/sensors/qambienttemperaturesensor.cpp @@ -148,5 +148,6 @@ QAmbientTemperatureReading *QAmbientTemperatureSensor::reading() const return static_cast<QAmbientTemperatureReading*>(QSensor::reading()); } -#include "moc_qambienttemperaturesensor.cpp" QT_END_NAMESPACE + +#include "moc_qambienttemperaturesensor.cpp" diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index 19659343..5bd2101b 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -188,6 +188,6 @@ QCompassReading *QCompass::reading() const return static_cast<QCompassReading*>(QSensor::reading()); } -#include "moc_qcompass.cpp" QT_END_NAMESPACE +#include "moc_qcompass.cpp" diff --git a/src/sensors/qdistancesensor.cpp b/src/sensors/qdistancesensor.cpp index 3226c584..916218f8 100644 --- a/src/sensors/qdistancesensor.cpp +++ b/src/sensors/qdistancesensor.cpp @@ -158,5 +158,6 @@ QDistanceReading *QDistanceSensor::reading() const return static_cast<QDistanceReading*>(QSensor::reading()); } -#include "moc_qdistancesensor.cpp" QT_END_NAMESPACE + +#include "moc_qdistancesensor.cpp" diff --git a/src/sensors/qgyroscope.cpp b/src/sensors/qgyroscope.cpp index cb1eb698..585da99b 100644 --- a/src/sensors/qgyroscope.cpp +++ b/src/sensors/qgyroscope.cpp @@ -200,6 +200,6 @@ QGyroscopeReading *QGyroscope::reading() const return static_cast<QGyroscopeReading*>(QSensor::reading()); } -#include "moc_qgyroscope.cpp" QT_END_NAMESPACE +#include "moc_qgyroscope.cpp" diff --git a/src/sensors/qholstersensor.cpp b/src/sensors/qholstersensor.cpp index b28815a6..8bb14748 100644 --- a/src/sensors/qholstersensor.cpp +++ b/src/sensors/qholstersensor.cpp @@ -152,5 +152,6 @@ QHolsterReading *QHolsterSensor::reading() const return static_cast<QHolsterReading*>(QSensor::reading()); } -#include "moc_qholstersensor.cpp" QT_END_NAMESPACE + +#include "moc_qholstersensor.cpp" diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp index aaf60b65..e566c6a6 100644 --- a/src/sensors/qhumiditysensor.cpp +++ b/src/sensors/qhumiditysensor.cpp @@ -177,5 +177,6 @@ QHumidityReading *QHumiditySensor::reading() const return static_cast<QHumidityReading*>(QSensor::reading()); } -#include "moc_qhumiditysensor.cpp" QT_END_NAMESPACE + +#include "moc_qhumiditysensor.cpp" diff --git a/src/sensors/qlidsensor.cpp b/src/sensors/qlidsensor.cpp index a759afd9..893987b7 100644 --- a/src/sensors/qlidsensor.cpp +++ b/src/sensors/qlidsensor.cpp @@ -178,5 +178,6 @@ QLidReading *QLidSensor::reading() const return static_cast<QLidReading*>(QSensor::reading()); } -#include "moc_qlidsensor.cpp" QT_END_NAMESPACE + +#include "moc_qlidsensor.cpp" diff --git a/src/sensors/qlightsensor.cpp b/src/sensors/qlightsensor.cpp index a7892f3a..efff15f9 100644 --- a/src/sensors/qlightsensor.cpp +++ b/src/sensors/qlightsensor.cpp @@ -185,6 +185,6 @@ void QLightSensor::setFieldOfView(qreal fieldOfView) } } -#include "moc_qlightsensor.cpp" QT_END_NAMESPACE +#include "moc_qlightsensor.cpp" diff --git a/src/sensors/qmagnetometer.cpp b/src/sensors/qmagnetometer.cpp index 0e28b5aa..ac2231ec 100644 --- a/src/sensors/qmagnetometer.cpp +++ b/src/sensors/qmagnetometer.cpp @@ -271,6 +271,6 @@ void QMagnetometer::setReturnGeoValues(bool returnGeoValues) } } -#include "moc_qmagnetometer.cpp" QT_END_NAMESPACE +#include "moc_qmagnetometer.cpp" diff --git a/src/sensors/qorientationsensor.cpp b/src/sensors/qorientationsensor.cpp index d2147a6f..91d10749 100644 --- a/src/sensors/qorientationsensor.cpp +++ b/src/sensors/qorientationsensor.cpp @@ -201,6 +201,6 @@ QOrientationReading *QOrientationSensor::reading() const return static_cast<QOrientationReading*>(QSensor::reading()); } -#include "moc_qorientationsensor.cpp" QT_END_NAMESPACE +#include "moc_qorientationsensor.cpp" diff --git a/src/sensors/qpressuresensor.cpp b/src/sensors/qpressuresensor.cpp index 8877f8c5..643f1fa1 100644 --- a/src/sensors/qpressuresensor.cpp +++ b/src/sensors/qpressuresensor.cpp @@ -178,5 +178,6 @@ QPressureReading *QPressureSensor::reading() const return static_cast<QPressureReading*>(QSensor::reading()); } -#include "moc_qpressuresensor.cpp" QT_END_NAMESPACE + +#include "moc_qpressuresensor.cpp" diff --git a/src/sensors/qproximitysensor.cpp b/src/sensors/qproximitysensor.cpp index 53af4c40..b568e6cd 100644 --- a/src/sensors/qproximitysensor.cpp +++ b/src/sensors/qproximitysensor.cpp @@ -157,6 +157,6 @@ QProximityReading *QProximitySensor::reading() const return static_cast<QProximityReading*>(QSensor::reading()); } -#include "moc_qproximitysensor.cpp" QT_END_NAMESPACE +#include "moc_qproximitysensor.cpp" diff --git a/src/sensors/qrotationsensor.cpp b/src/sensors/qrotationsensor.cpp index 6c9559ea..44424b50 100644 --- a/src/sensors/qrotationsensor.cpp +++ b/src/sensors/qrotationsensor.cpp @@ -261,6 +261,6 @@ void QRotationSensor::setHasZ(bool hasZ) } } -#include "moc_qrotationsensor.cpp" QT_END_NAMESPACE +#include "moc_qrotationsensor.cpp" diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 8eab8872..d8bb0bee 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -1389,6 +1389,7 @@ void QSensorReading::copyValuesFrom(QSensorReading *other) \sa DECLARE_READING() */ -#include "moc_qsensor.cpp" QT_END_NAMESPACE +#include "moc_qsensor.cpp" + diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp index bb1a8855..31e2e811 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -350,6 +350,6 @@ void QSensorBackend::sensorError(int error) Q_EMIT d->m_sensor->sensorError(error); } -#include "moc_qsensorbackend.cpp" QT_END_NAMESPACE +#include "moc_qsensorbackend.cpp" diff --git a/src/sensors/qtapsensor.cpp b/src/sensors/qtapsensor.cpp index b26e596f..9889a8c2 100644 --- a/src/sensors/qtapsensor.cpp +++ b/src/sensors/qtapsensor.cpp @@ -269,6 +269,6 @@ void QTapSensor::setReturnDoubleTapEvents(bool returnDoubleTapEvents) } } -#include "moc_qtapsensor.cpp" QT_END_NAMESPACE +#include "moc_qtapsensor.cpp" diff --git a/src/sensors/qtiltsensor.cpp b/src/sensors/qtiltsensor.cpp index d904527c..310ed36c 100644 --- a/src/sensors/qtiltsensor.cpp +++ b/src/sensors/qtiltsensor.cpp @@ -181,5 +181,6 @@ void QTiltSensor::calibrate() QMetaObject::invokeMethod(backend(), "calibrate", Qt::DirectConnection); } -#include "moc_qtiltsensor.cpp" QT_END_NAMESPACE + +#include "moc_qtiltsensor.cpp" |