diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| -rw-r--r-- | src/positioningquick/qdeclarativegeoaddress_p.h | 2 | ||||
| -rw-r--r-- | src/positioningquick/qdeclarativegeolocation_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_geolocation/tst_declarativegeolocation.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_positioning_core/tst_address.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_positioning_core/tst_coordinate.qml | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/.cmake.conf b/.cmake.conf index 213991f5..4e73b3d6 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.1.0") +set(QT_REPO_MODULE_VERSION "6.2.0") diff --git a/dependencies.yaml b/dependencies.yaml index a12204de..82670052 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: b101f84f86e541fa30c0d6d2a4e549cf51118706 + ref: 9a5a2d61c077ddc8a0fb4e2cce7a36a5dbb081d5 required: true ../qtdeclarative: - ref: 48927f80ad97bfbe739a85d9dd726679601798a8 + ref: e9ac81ab78bedd7618cce8ac051b209385038f48 required: false ../qtquickcontrols2: - ref: 569d37253b86b2e6147d90113b77bddc4b057da2 + ref: 0c41aefa6fb2f49066e2833ba1466d35585d2910 required: false ../qtserialport: - ref: 0cecc4f63e4f47072788d9639ae2c773ea8c3d81 + ref: 12f5550967271d96256ebda437e8a3d2d502aab7 required: false diff --git a/src/positioningquick/qdeclarativegeoaddress_p.h b/src/positioningquick/qdeclarativegeoaddress_p.h index 45271ffd..d98be2e4 100644 --- a/src/positioningquick/qdeclarativegeoaddress_p.h +++ b/src/positioningquick/qdeclarativegeoaddress_p.h @@ -74,7 +74,7 @@ class Q_POSITIONINGQUICK_PRIVATE_EXPORT QDeclarativeGeoAddress : public QObject Q_PROPERTY(QString district READ district WRITE setDistrict NOTIFY districtChanged) Q_PROPERTY(QString street READ street WRITE setStreet NOTIFY streetChanged) Q_PROPERTY(QString streetNumber READ streetNumber WRITE setStreetNumber - NOTIFY streetNumberChanged REVISION(6, 0)) + NOTIFY streetNumberChanged REVISION(6, 2)) Q_PROPERTY(QString postalCode READ postalCode WRITE setPostalCode NOTIFY postalCodeChanged) Q_PROPERTY(bool isTextGenerated READ isTextGenerated NOTIFY isTextGeneratedChanged) diff --git a/src/positioningquick/qdeclarativegeolocation_p.h b/src/positioningquick/qdeclarativegeolocation_p.h index afb36ac6..e9310229 100644 --- a/src/positioningquick/qdeclarativegeolocation_p.h +++ b/src/positioningquick/qdeclarativegeolocation_p.h @@ -69,7 +69,7 @@ class Q_POSITIONINGQUICK_PRIVATE_EXPORT QDeclarativeGeoLocation : public QObject Q_PROPERTY(QGeoLocation location READ location WRITE setLocation) Q_PROPERTY(QDeclarativeGeoAddress *address READ address WRITE setAddress NOTIFY addressChanged) Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged) - Q_PROPERTY(QGeoShape boundingShape READ boundingShape WRITE setBoundingShape NOTIFY boundingShapeChanged REVISION(6, 0)) + Q_PROPERTY(QGeoShape boundingShape READ boundingShape WRITE setBoundingShape NOTIFY boundingShapeChanged REVISION(6, 2)) Q_PROPERTY(QVariantMap extendedAttributes MEMBER m_extendedAttributes NOTIFY extendedAttributesChanged REVISION(5, 13)) public: diff --git a/tests/auto/declarative_geolocation/tst_declarativegeolocation.qml b/tests/auto/declarative_geolocation/tst_declarativegeolocation.qml index f119c7f6..74aa36ee 100644 --- a/tests/auto/declarative_geolocation/tst_declarativegeolocation.qml +++ b/tests/auto/declarative_geolocation/tst_declarativegeolocation.qml @@ -28,7 +28,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtPositioning 6.0 +import QtPositioning 6.2 Item { id: testCase diff --git a/tests/auto/declarative_positioning_core/tst_address.qml b/tests/auto/declarative_positioning_core/tst_address.qml index ead953bc..bfbe1a63 100644 --- a/tests/auto/declarative_positioning_core/tst_address.qml +++ b/tests/auto/declarative_positioning_core/tst_address.qml @@ -27,7 +27,7 @@ ****************************************************************************/ import QtTest 1.0 -import QtPositioning 6.1 +import QtPositioning 6.2 TestCase { id: testCase diff --git a/tests/auto/declarative_positioning_core/tst_coordinate.qml b/tests/auto/declarative_positioning_core/tst_coordinate.qml index 30d92bda..b1c078c3 100644 --- a/tests/auto/declarative_positioning_core/tst_coordinate.qml +++ b/tests/auto/declarative_positioning_core/tst_coordinate.qml @@ -28,7 +28,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtPositioning 6.0 +import QtPositioning 6.2 Item { id: item |