diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/sensors/accelbubble/accelbubble.qml | 4 | ||||
| -rw-r--r-- | src/plugins/sensors/ios/iosproximitysensor.mm | 5 | ||||
| -rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 097d8b94..f8cda0e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.0 +MODULE_VERSION = 5.13.0 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/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/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; |