diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-08-23 10:08:46 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-23 14:43:31 +0000 |
| commit | f6f8699811734fbac75b6aa3e19af46c27613990 (patch) | |
| tree | a795bbeef6b5b31b0a4599a2299fb2ac95621b07 | |
| parent | aca17e6775a9324a1f63e866df2bc647226caf1d (diff) | |
QML Permissions: Use correct version tagging macro
QML_ADDED_IN_MINOR_VERSION results in wrong qmltypes entries, "(max
version).6" instead of "6.6"
Fixes: QTBUG-116390
Change-Id: I6ed83cabaeae24bea9078b929ff0204ba635764b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 4fcadf6a36aca48c5cfb0cc717c30211f5be0ba8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/qqmlpermissions_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/qqmlpermissions_p.h b/src/core/qqmlpermissions_p.h index a113543ac3..83692d4caf 100644 --- a/src/core/qqmlpermissions_p.h +++ b/src/core/qqmlpermissions_p.h @@ -68,7 +68,7 @@ public: struct QQmlQLocationPermission : public QObject { QML_PERMISSION(LocationPermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) QML_EXTENDED_NAMESPACE(QLocationPermission) QML_PERMISSION_PROPERTY(QLocationPermission::Availability, availability, setAvailability) QML_PERMISSION_PROPERTY(QLocationPermission::Accuracy, accuracy, setAccuracy) @@ -77,7 +77,7 @@ struct QQmlQLocationPermission : public QObject struct QQmlCalendarPermission : public QObject { QML_PERMISSION(CalendarPermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) QML_EXTENDED_NAMESPACE(QCalendarPermission) QML_PERMISSION_PROPERTY(QCalendarPermission::AccessMode, accessMode, setAccessMode) }; @@ -85,7 +85,7 @@ struct QQmlCalendarPermission : public QObject struct QQmlContactsPermission : public QObject { QML_PERMISSION(ContactsPermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) QML_EXTENDED_NAMESPACE(QContactsPermission) QML_PERMISSION_PROPERTY(QContactsPermission::AccessMode, accessMode, setAccessMode) }; @@ -93,7 +93,7 @@ struct QQmlContactsPermission : public QObject struct QQmlBluetoothPermission : public QObject { QML_PERMISSION(BluetoothPermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) QML_EXTENDED_NAMESPACE(QBluetoothPermission) QML_PERMISSION_PROPERTY(QBluetoothPermission::CommunicationModes, communicationModes, setCommunicationModes) }; @@ -101,13 +101,13 @@ struct QQmlBluetoothPermission : public QObject struct QQmlCameraPermission : public QObject { QML_PERMISSION(CameraPermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) }; struct QQmlMicrophonePermission : public QObject { QML_PERMISSION(MicrophonePermission) - QML_ADDED_IN_MINOR_VERSION(6) + QML_ADDED_IN_VERSION(6, 6) }; QT_END_NAMESPACE |