diff options
author | Kai Köhne <kai.koehne@qt.io> | 2023-07-05 15:25:56 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2023-07-10 08:39:39 +0200 |
commit | ab64ffcef403f13c4eb212e889bc3578dbfd01f8 (patch) | |
tree | 8266118e0b0d80d4ce7a55b290ff05fc02abe08a | |
parent | b982b4bb8b69926218c5eb354e4fd04c66b4f6f7 (diff) |
Doc: Don't use versioned Qt imports in QML snippets
We don't promote versioned imports anymore in Qt 6.
Patch done by
find . -path "*/snippets/*.qml" -exec perl -pi -e "s/import Qt([\.a-zA-Z]*) \d\.\d+/import Qt\\1/g" {} ;
Pick-to: 6.5 6.6
Change-Id: I326ab333f936657253b03814041a02a25521cddd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
5 files changed, 22 insertions, 22 deletions
diff --git a/src/location/doc/snippets/declarative/maps.qml b/src/location/doc/snippets/declarative/maps.qml index a5d4e1d2..4e0e4311 100644 --- a/src/location/doc/snippets/declarative/maps.qml +++ b/src/location/doc/snippets/declarative/maps.qml @@ -2,11 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [QtQuick import] -import QtQuick 2.0 +import QtQuick //! [QtQuick import] //! [QtLocation import] -import QtPositioning 5.5 -import QtLocation 5.6 +import QtPositioning +import QtLocation //! [QtLocation import] Item { @@ -51,7 +51,7 @@ Item { property MapCircle circle Component.onCompleted: { - circle = Qt.createQmlObject('import QtLocation 5.3; MapCircle {}', page) + circle = Qt.createQmlObject('import QtLocation; MapCircle {}', page) circle.center = positionSource.position.coordinate circle.radius = 5000.0 circle.color = 'green' diff --git a/src/location/doc/snippets/declarative/places.qml b/src/location/doc/snippets/declarative/places.qml index ca66b05c..a4131742 100644 --- a/src/location/doc/snippets/declarative/places.qml +++ b/src/location/doc/snippets/declarative/places.qml @@ -2,10 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [QtQuick import] -import QtQuick 2.0 +import QtQuick //! [QtQuick import] -import QtPositioning 5.5 -import QtLocation 5.6 +import QtPositioning +import QtLocation Item { width: 400; height: 400; @@ -67,7 +67,7 @@ Item { function writeExtendedAttributes() { //! [ExtendedAttributes write] //assign a new attribute to a place - var smokingAttrib = Qt.createQmlObject('import QtLocation 5.3; PlaceAttribute {}', place); + var smokingAttrib = Qt.createQmlObject('import QtLocation; PlaceAttribute {}', place); smokingAttrib.label = "Smoking Allowed" smokingAttrib.text = "No" place.extendedAttributes.smoking = smokingAttrib; @@ -235,7 +235,7 @@ Item { //! [ContactDetails write single] function writeSingle() { - var phoneNumber = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); + var phoneNumber = Qt.createQmlObject('import QtLocation; ContactDetail {}', place); phoneNumber.label = "Phone"; phoneNumber.value = "555-5555" place.contactDetails.phone = phoneNumber; @@ -244,11 +244,11 @@ Item { //! [ContactDetails write multiple] function writeMultiple() { - var bob = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); + var bob = Qt.createQmlObject('import QtLocation; ContactDetail {}', place); bob.label = "Bob"; bob.value = "555-5555" - var alice = Qt.createQmlObject('import QtLocation 5.3; ContactDetail {}', place); + var alice = Qt.createQmlObject('import QtLocation; ContactDetail {}', place); alice.label = "Alice"; alice.value = "555-8745" @@ -306,7 +306,7 @@ Item { function createAndSavePlace() { //! [Place createAndSavePlace] //creating and saving a place - var place = Qt.createQmlObject('import QtLocation 5.3; Place { }', parent); + var place = Qt.createQmlObject('import QtLocation; Place { }', parent); place.plugin = myPlugin; place.name = "New York"; place.location.coordinate.latitude = 40.7 @@ -324,7 +324,7 @@ Item { function saveToNewPlugin() { //! [Place save to different plugin] - var place = Qt.createQmlObject('import QtLocation 5.3; Place { }', parent); + var place = Qt.createQmlObject('import QtLocation; Place { }', parent); place.plugin = destinationPlugin; place.copyFrom(originalPlace); place.save(); @@ -367,7 +367,7 @@ Item { //! [Place favorite] function saveFavorite() { - var place = Qt.createQmlObject('import QtLocation 5.3; Place { }', parent); + var place = Qt.createQmlObject('import QtLocation; Place { }', parent); var destinationPlugin //! [Place saveFavorite] place.initializeFavorite(destinationPlugin); diff --git a/src/location/doc/snippets/declarative/places_loader.qml b/src/location/doc/snippets/declarative/places_loader.qml index 88e328db..087c3054 100644 --- a/src/location/doc/snippets/declarative/places_loader.qml +++ b/src/location/doc/snippets/declarative/places_loader.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 -import QtPositioning 5.2 -import QtLocation 5.3 +import QtQuick +import QtPositioning +import QtLocation Rectangle { width: 360 diff --git a/src/location/doc/snippets/declarative/plugin.qml b/src/location/doc/snippets/declarative/plugin.qml index 2488d666..d9baa410 100644 --- a/src/location/doc/snippets/declarative/plugin.qml +++ b/src/location/doc/snippets/declarative/plugin.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //! [Plugin import] -import QtLocation 5.3 +import QtLocation //! [Plugin import] Item { diff --git a/src/location/doc/snippets/declarative/routing.qml b/src/location/doc/snippets/declarative/routing.qml index c63ae46a..5e577c43 100644 --- a/src/location/doc/snippets/declarative/routing.qml +++ b/src/location/doc/snippets/declarative/routing.qml @@ -2,10 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [QtQuick import] -import QtQuick 2.3 +import QtQuick //! [QtQuick import] -import QtPositioning 5.5 -import QtLocation 5.6 +import QtPositioning +import QtLocation Item { width: 1000 |