From cd3c7efe4ba2f0b3d4a80db980db0d74ffd8e7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 27 Jun 2023 10:44:25 +0200 Subject: 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: I20a5bf52f7cdd99124626f85ce9794af74382977 Reviewed-by: Ulf Hermann --- src/qml/doc/snippets/code/backend/main.qml | 4 ++-- src/qml/doc/snippets/qml/Button.qml | 2 +- src/qml/doc/snippets/qml/DynamicText.qml | 2 +- src/qml/doc/snippets/qml/SelfDestroyingRect.qml | 2 +- src/qml/doc/snippets/qml/Sprite.qml | 2 +- src/qml/doc/snippets/qml/application.qml | 2 +- src/qml/doc/snippets/qml/comments.qml | 2 +- src/qml/doc/snippets/qml/component.qml | 2 +- src/qml/doc/snippets/qml/component/MyItem.qml | 2 +- src/qml/doc/snippets/qml/component/main.qml | 2 +- src/qml/doc/snippets/qml/createComponent-simple.qml | 2 +- src/qml/doc/snippets/qml/createComponent.qml | 2 +- src/qml/doc/snippets/qml/createQmlObject.qml | 4 ++-- src/qml/doc/snippets/qml/dynamicObjects-destroy.qml | 2 +- src/qml/doc/snippets/qml/events.qml | 2 +- src/qml/doc/snippets/qml/imports/installed-module.qml | 2 +- src/qml/doc/snippets/qml/imports/named-imports.qml | 2 +- src/qml/doc/snippets/qml/imports/qtquick-1.0.qml | 2 +- src/qml/doc/snippets/qml/integrating-javascript/connectjs.qml | 2 +- src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml | 2 +- .../qml/integrating-javascript/scarceresources/exampleFive.qml | 4 ++-- .../qml/integrating-javascript/scarceresources/exampleFour.qml | 4 ++-- .../qml/integrating-javascript/scarceresources/exampleOne.qml | 4 ++-- .../qml/integrating-javascript/scarceresources/exampleThree.qml | 4 ++-- .../qml/integrating-javascript/scarceresources/exampleTwo.qml | 4 ++-- src/qml/doc/snippets/qml/properties.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/A.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/B.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/Images.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/LabeledImageBox.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/inline-component.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/inline-text-component.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/non-trivial.qml | 2 +- src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml | 2 +- src/qml/doc/snippets/qml/qsTr.qml | 2 +- src/qml/doc/snippets/qml/qsTrId.1.qml | 2 +- src/qml/doc/snippets/qml/qsTrId.qml | 2 +- src/qml/doc/snippets/qml/qsTranslate.qml | 2 +- src/qml/doc/snippets/qml/qtBinding.1.qml | 2 +- src/qml/doc/snippets/qml/qtBinding.2.qml | 2 +- src/qml/doc/snippets/qml/qtBinding.3.qml | 2 +- src/qml/doc/snippets/qml/qtBinding.4.qml | 2 +- src/qml/doc/snippets/qml/qtLater.qml | 2 +- src/qml/doc/snippets/qml/qtTrIdNoOp.qml | 2 +- src/qml/doc/snippets/qml/qtTrNoOp.qml | 2 +- src/qml/doc/snippets/qml/qtTranslateNoOp.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/context-advanced/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/context-advanced/connections.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/context/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/functions-qml/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/loading/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/properties-qml/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/signals-qml/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtbinding/variantlistmap/MyItem.qml | 2 +- src/qml/doc/snippets/qml/qtobject.qml | 2 +- src/qml/doc/snippets/qml/reusablecomponents/Button.qml | 2 +- src/qml/doc/snippets/qml/reusablecomponents/application.qml | 2 +- src/qml/doc/snippets/qml/reusablecomponents/component.qml | 2 +- src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml | 2 +- 59 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src/qml') diff --git a/src/qml/doc/snippets/code/backend/main.qml b/src/qml/doc/snippets/code/backend/main.qml index bae7e99904..7bad89374f 100644 --- a/src/qml/doc/snippets/code/backend/main.qml +++ b/src/qml/doc/snippets/code/backend/main.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [main_qml] -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick +import QtQuick.Controls //![import] import io.qt.examples.backend 1.0 //![import] diff --git a/src/qml/doc/snippets/qml/Button.qml b/src/qml/doc/snippets/qml/Button.qml index 1aba2cd39f..aacce0c37a 100644 --- a/src/qml/doc/snippets/qml/Button.qml +++ b/src/qml/doc/snippets/qml/Button.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick //! [parent begin] Rectangle { diff --git a/src/qml/doc/snippets/qml/DynamicText.qml b/src/qml/doc/snippets/qml/DynamicText.qml index fd54fc6ced..93b614a628 100644 --- a/src/qml/doc/snippets/qml/DynamicText.qml +++ b/src/qml/doc/snippets/qml/DynamicText.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Text { id: textElement diff --git a/src/qml/doc/snippets/qml/SelfDestroyingRect.qml b/src/qml/doc/snippets/qml/SelfDestroyingRect.qml index e788a62642..b31c0857ba 100644 --- a/src/qml/doc/snippets/qml/SelfDestroyingRect.qml +++ b/src/qml/doc/snippets/qml/SelfDestroyingRect.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Rectangle { id: rect diff --git a/src/qml/doc/snippets/qml/Sprite.qml b/src/qml/doc/snippets/qml/Sprite.qml index 5d3a5bf804..fc0032c4f7 100644 --- a/src/qml/doc/snippets/qml/Sprite.qml +++ b/src/qml/doc/snippets/qml/Sprite.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Rectangle { width: 80; height: 50; color: "red" } //![0] diff --git a/src/qml/doc/snippets/qml/application.qml b/src/qml/doc/snippets/qml/application.qml index 79563fab46..a7eb91c37c 100644 --- a/src/qml/doc/snippets/qml/application.qml +++ b/src/qml/doc/snippets/qml/application.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { width: 300; height: 55 diff --git a/src/qml/doc/snippets/qml/comments.qml b/src/qml/doc/snippets/qml/comments.qml index 2cba0552b8..aa01bf110b 100644 --- a/src/qml/doc/snippets/qml/comments.qml +++ b/src/qml/doc/snippets/qml/comments.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { diff --git a/src/qml/doc/snippets/qml/component.qml b/src/qml/doc/snippets/qml/component.qml index e6229aee3e..c166d87fa5 100644 --- a/src/qml/doc/snippets/qml/component.qml +++ b/src/qml/doc/snippets/qml/component.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Item { width: 100; height: 100 diff --git a/src/qml/doc/snippets/qml/component/MyItem.qml b/src/qml/doc/snippets/qml/component/MyItem.qml index 6d49690cf1..7a3290ffa6 100644 --- a/src/qml/doc/snippets/qml/component/MyItem.qml +++ b/src/qml/doc/snippets/qml/component/MyItem.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/component/main.qml b/src/qml/doc/snippets/qml/component/main.qml index b9bf933362..a76471dce2 100644 --- a/src/qml/doc/snippets/qml/component/main.qml +++ b/src/qml/doc/snippets/qml/component/main.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] ListView { diff --git a/src/qml/doc/snippets/qml/createComponent-simple.qml b/src/qml/doc/snippets/qml/createComponent-simple.qml index 6e9c188734..2adc1c49f2 100644 --- a/src/qml/doc/snippets/qml/createComponent-simple.qml +++ b/src/qml/doc/snippets/qml/createComponent-simple.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Item { id: container diff --git a/src/qml/doc/snippets/qml/createComponent.qml b/src/qml/doc/snippets/qml/createComponent.qml index 292f51f9eb..f71526fc70 100644 --- a/src/qml/doc/snippets/qml/createComponent.qml +++ b/src/qml/doc/snippets/qml/createComponent.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick import "componentCreation.js" as MyScript Rectangle { diff --git a/src/qml/doc/snippets/qml/createQmlObject.qml b/src/qml/doc/snippets/qml/createQmlObject.qml index 77137328c3..32d9e8cff2 100644 --- a/src/qml/doc/snippets/qml/createQmlObject.qml +++ b/src/qml/doc/snippets/qml/createQmlObject.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick Rectangle { id: parentItem @@ -12,7 +12,7 @@ Rectangle { function createIt() { //![0] const newObject = Qt.createQmlObject(` - import QtQuick 2.0 + import QtQuick Rectangle { color: "red" diff --git a/src/qml/doc/snippets/qml/dynamicObjects-destroy.qml b/src/qml/doc/snippets/qml/dynamicObjects-destroy.qml index bac07b0178..91db58f7bb 100644 --- a/src/qml/doc/snippets/qml/dynamicObjects-destroy.qml +++ b/src/qml/doc/snippets/qml/dynamicObjects-destroy.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Item { id: container diff --git a/src/qml/doc/snippets/qml/events.qml b/src/qml/doc/snippets/qml/events.qml index 81df6ded1b..3e5171102a 100644 --- a/src/qml/doc/snippets/qml/events.qml +++ b/src/qml/doc/snippets/qml/events.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![document] -import QtQuick 2.0 +import QtQuick //![parent begin] Rectangle { diff --git a/src/qml/doc/snippets/qml/imports/installed-module.qml b/src/qml/doc/snippets/qml/imports/installed-module.qml index 6fa2e7d953..fa8534b4f8 100644 --- a/src/qml/doc/snippets/qml/imports/installed-module.qml +++ b/src/qml/doc/snippets/qml/imports/installed-module.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [imports] -import QtQuick 2.0 +import QtQuick import com.nokia.qml.mymodule 1.0 //! [imports] diff --git a/src/qml/doc/snippets/qml/imports/named-imports.qml b/src/qml/doc/snippets/qml/imports/named-imports.qml index 075fd9b2f4..750b41aee5 100644 --- a/src/qml/doc/snippets/qml/imports/named-imports.qml +++ b/src/qml/doc/snippets/qml/imports/named-imports.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [imports] -import QtQuick 2.0 as QtLibrary +import QtQuick as QtLibrary import "../MyComponents" as MyComponents import com.nokia.qml.mymodule 1.0 as MyModule //! [imports] diff --git a/src/qml/doc/snippets/qml/imports/qtquick-1.0.qml b/src/qml/doc/snippets/qml/imports/qtquick-1.0.qml index e1a4e0eb0a..7a1d3d85a7 100644 --- a/src/qml/doc/snippets/qml/imports/qtquick-1.0.qml +++ b/src/qml/doc/snippets/qml/imports/qtquick-1.0.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [import] -import QtQuick 2.0 +import QtQuick //! [import] Item { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/connectjs.qml b/src/qml/doc/snippets/qml/integrating-javascript/connectjs.qml index da44b63aef..a83f9466d8 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/connectjs.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/connectjs.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.12 +import QtQuick import "script.js" as MyScript Item { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml b/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml index 31558a5ee2..84c35c4900 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/includejs/app.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick import "script.mjs" as MyScript Item { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml index 3cec18c87f..d72de68a23 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // exampleFive.qml -import QtQuick 2.0 -import Qt.example 1.0 +import QtQuick +import Qt.example import "exampleFour.js" as ExampleFourJs // use factory from example four QtObject { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml index 80bdc35d3a..2002ed394b 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // exampleFour.qml -import QtQuick 2.0 -import Qt.example 1.0 +import QtQuick +import Qt.example import "exampleFour.js" as ExampleFourJs QtObject { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml index 9d52e0fe40..76b161fe26 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // exampleOne.qml -import QtQuick 2.0 -import Qt.example 1.0 +import QtQuick +import Qt.example QtObject { property AvatarExample a; diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml index daf1a1e432..286ff8aaef 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // exampleThree.qml -import QtQuick 2.0 -import Qt.example 1.0 +import QtQuick +import Qt.example import "exampleThree.js" as ExampleThreeJs QtObject { diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml index 1aac883c1a..dcfe6e4cd0 100644 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml +++ b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // exampleTwo.qml -import QtQuick 2.0 -import Qt.example 1.0 +import QtQuick +import Qt.example QtObject { property AvatarExample a; diff --git a/src/qml/doc/snippets/qml/properties.qml b/src/qml/doc/snippets/qml/properties.qml index 3134a4c2e5..67a7267acf 100644 --- a/src/qml/doc/snippets/qml/properties.qml +++ b/src/qml/doc/snippets/qml/properties.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick //! [parent begin] Rectangle { diff --git a/src/qml/doc/snippets/qml/qml-documents/A.qml b/src/qml/doc/snippets/qml/qml-documents/A.qml index 924bea9639..de9894788b 100644 --- a/src/qml/doc/snippets/qml/qml-documents/A.qml +++ b/src/qml/doc/snippets/qml/qml-documents/A.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] // A.qml -import QtQuick 2.15 +import QtQuick Item { id: root diff --git a/src/qml/doc/snippets/qml/qml-documents/B.qml b/src/qml/doc/snippets/qml/qml-documents/B.qml index 5f354be5e1..27fce37d9f 100644 --- a/src/qml/doc/snippets/qml/qml-documents/B.qml +++ b/src/qml/doc/snippets/qml/qml-documents/B.qml @@ -3,7 +3,7 @@ //! [document] // B.qml -import QtQuick 2.15 +import QtQuick Item { A.MyInlineComponent {} diff --git a/src/qml/doc/snippets/qml/qml-documents/Images.qml b/src/qml/doc/snippets/qml/qml-documents/Images.qml index 77f83f46ec..613e223b34 100644 --- a/src/qml/doc/snippets/qml/qml-documents/Images.qml +++ b/src/qml/doc/snippets/qml/qml-documents/Images.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] // Images.qml -import QtQuick 2.15 +import QtQuick Item { component LabeledImage: Column { diff --git a/src/qml/doc/snippets/qml/qml-documents/LabeledImageBox.qml b/src/qml/doc/snippets/qml/qml-documents/LabeledImageBox.qml index 92bd55799e..bfc5a7b45e 100644 --- a/src/qml/doc/snippets/qml/qml-documents/LabeledImageBox.qml +++ b/src/qml/doc/snippets/qml/qml-documents/LabeledImageBox.qml @@ -3,7 +3,7 @@ //! [document] // LabeledImageBox.qml -import QtQuick 2.15 +import QtQuick Rectangle { property alias caption: image.caption diff --git a/src/qml/doc/snippets/qml/qml-documents/inline-component.qml b/src/qml/doc/snippets/qml/qml-documents/inline-component.qml index 72e7487e73..32286790a5 100644 --- a/src/qml/doc/snippets/qml/qml-documents/inline-component.qml +++ b/src/qml/doc/snippets/qml/qml-documents/inline-component.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { width: 240; height: 320; diff --git a/src/qml/doc/snippets/qml/qml-documents/inline-text-component.qml b/src/qml/doc/snippets/qml/qml-documents/inline-text-component.qml index 2cc440bc6d..096d060583 100644 --- a/src/qml/doc/snippets/qml/qml-documents/inline-text-component.qml +++ b/src/qml/doc/snippets/qml/qml-documents/inline-text-component.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { width: 240; height: 320; diff --git a/src/qml/doc/snippets/qml/qml-documents/non-trivial.qml b/src/qml/doc/snippets/qml/qml-documents/non-trivial.qml index 5f301130d9..9fccc3d286 100644 --- a/src/qml/doc/snippets/qml/qml-documents/non-trivial.qml +++ b/src/qml/doc/snippets/qml/qml-documents/non-trivial.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { width: 240; height: 320; diff --git a/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml b/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml index 1809cc7f99..b71ff6cad8 100644 --- a/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml +++ b/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { property alias text: textItem.text diff --git a/src/qml/doc/snippets/qml/qsTr.qml b/src/qml/doc/snippets/qml/qsTr.qml index 4b1f358bd8..c1a48c9d32 100644 --- a/src/qml/doc/snippets/qml/qsTr.qml +++ b/src/qml/doc/snippets/qml/qsTr.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { text: qsTr("hello") } diff --git a/src/qml/doc/snippets/qml/qsTrId.1.qml b/src/qml/doc/snippets/qml/qsTrId.1.qml index 8da6023c4d..4989adad25 100644 --- a/src/qml/doc/snippets/qml/qsTrId.1.qml +++ b/src/qml/doc/snippets/qml/qsTrId.1.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { diff --git a/src/qml/doc/snippets/qml/qsTrId.qml b/src/qml/doc/snippets/qml/qsTrId.qml index b6fd569fd5..b407896943 100644 --- a/src/qml/doc/snippets/qml/qsTrId.qml +++ b/src/qml/doc/snippets/qml/qsTrId.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { text: qsTrId("hello_id") } diff --git a/src/qml/doc/snippets/qml/qsTranslate.qml b/src/qml/doc/snippets/qml/qsTranslate.qml index 2634ec9834..fe0936b1b7 100644 --- a/src/qml/doc/snippets/qml/qsTranslate.qml +++ b/src/qml/doc/snippets/qml/qsTranslate.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { text: qsTranslate("CustomContext", "hello") } diff --git a/src/qml/doc/snippets/qml/qtBinding.1.qml b/src/qml/doc/snippets/qml/qtBinding.1.qml index 24d71a847b..5ea94d36ab 100644 --- a/src/qml/doc/snippets/qml/qtBinding.1.qml +++ b/src/qml/doc/snippets/qml/qtBinding.1.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtBinding.2.qml b/src/qml/doc/snippets/qml/qtBinding.2.qml index af76ee1dd6..57151f341f 100644 --- a/src/qml/doc/snippets/qml/qtBinding.2.qml +++ b/src/qml/doc/snippets/qml/qtBinding.2.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtBinding.3.qml b/src/qml/doc/snippets/qml/qtBinding.3.qml index bb1964695f..8ec24a7c7f 100644 --- a/src/qml/doc/snippets/qml/qtBinding.3.qml +++ b/src/qml/doc/snippets/qml/qtBinding.3.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtBinding.4.qml b/src/qml/doc/snippets/qml/qtBinding.4.qml index 640428573f..08f0953314 100644 --- a/src/qml/doc/snippets/qml/qtBinding.4.qml +++ b/src/qml/doc/snippets/qml/qtBinding.4.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtLater.qml b/src/qml/doc/snippets/qml/qtLater.qml index 09970b10b1..cb999b09c1 100644 --- a/src/qml/doc/snippets/qml/qtLater.qml +++ b/src/qml/doc/snippets/qml/qtLater.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Rectangle { width: 480 diff --git a/src/qml/doc/snippets/qml/qtTrIdNoOp.qml b/src/qml/doc/snippets/qml/qtTrIdNoOp.qml index 1a8df6ca1e..14d802c776 100644 --- a/src/qml/doc/snippets/qml/qtTrIdNoOp.qml +++ b/src/qml/doc/snippets/qml/qtTrIdNoOp.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtTrNoOp.qml b/src/qml/doc/snippets/qml/qtTrNoOp.qml index 266b76214c..550619afd7 100644 --- a/src/qml/doc/snippets/qml/qtTrNoOp.qml +++ b/src/qml/doc/snippets/qml/qtTrNoOp.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtTranslateNoOp.qml b/src/qml/doc/snippets/qml/qtTranslateNoOp.qml index 28fdc86d55..46d5dc05da 100644 --- a/src/qml/doc/snippets/qml/qtTranslateNoOp.qml +++ b/src/qml/doc/snippets/qml/qtTranslateNoOp.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Item { diff --git a/src/qml/doc/snippets/qml/qtbinding/context-advanced/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/context-advanced/MyItem.qml index 0d44a69b14..486b3bba42 100644 --- a/src/qml/doc/snippets/qml/qtbinding/context-advanced/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/context-advanced/MyItem.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // MyItem.qml -import QtQuick 2.0 +import QtQuick Text { text: applicationData.getCurrentDateTime() } //![0] diff --git a/src/qml/doc/snippets/qml/qtbinding/context-advanced/connections.qml b/src/qml/doc/snippets/qml/qtbinding/context-advanced/connections.qml index ac2575ade1..f769e3246c 100644 --- a/src/qml/doc/snippets/qml/qtbinding/context-advanced/connections.qml +++ b/src/qml/doc/snippets/qml/qtbinding/context-advanced/connections.qml @@ -1,6 +1,6 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] Text { diff --git a/src/qml/doc/snippets/qml/qtbinding/context/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/context/MyItem.qml index fd5f6e65f3..c03a5d26b7 100644 --- a/src/qml/doc/snippets/qml/qtbinding/context/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/context/MyItem.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // MyItem.qml -import QtQuick 2.0 +import QtQuick Text { text: currentDateTime } //![0] diff --git a/src/qml/doc/snippets/qml/qtbinding/functions-qml/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/functions-qml/MyItem.qml index f66e8d582c..b26522f3f0 100644 --- a/src/qml/doc/snippets/qml/qtbinding/functions-qml/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/functions-qml/MyItem.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // MyItem.qml -import QtQuick 2.0 +import QtQuick Item { function myQmlFunction(msg: string) : string { diff --git a/src/qml/doc/snippets/qml/qtbinding/loading/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/loading/MyItem.qml index eff81c8c0f..a2403ce9d2 100644 --- a/src/qml/doc/snippets/qml/qtbinding/loading/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/loading/MyItem.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![start] -import QtQuick 2.0 +import QtQuick Item { width: 100; height: 100 diff --git a/src/qml/doc/snippets/qml/qtbinding/properties-qml/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/properties-qml/MyItem.qml index f0e6fe77f5..ff626d3837 100644 --- a/src/qml/doc/snippets/qml/qtbinding/properties-qml/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/properties-qml/MyItem.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // MyItem.qml -import QtQuick 2.0 +import QtQuick Item { property int someNumber: 100 diff --git a/src/qml/doc/snippets/qml/qtbinding/signals-qml/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/signals-qml/MyItem.qml index 064dcd35d0..9d141be179 100644 --- a/src/qml/doc/snippets/qml/qtbinding/signals-qml/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/signals-qml/MyItem.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] // MyItem.qml -import QtQuick 2.0 +import QtQuick Item { id: item diff --git a/src/qml/doc/snippets/qml/qtbinding/variantlistmap/MyItem.qml b/src/qml/doc/snippets/qml/qtbinding/variantlistmap/MyItem.qml index 2379f43d93..e50ae519b0 100644 --- a/src/qml/doc/snippets/qml/qtbinding/variantlistmap/MyItem.qml +++ b/src/qml/doc/snippets/qml/qtbinding/variantlistmap/MyItem.qml @@ -1,6 +1,6 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 +import QtQuick //![0] // MyItem.qml diff --git a/src/qml/doc/snippets/qml/qtobject.qml b/src/qml/doc/snippets/qml/qtobject.qml index 46bc1d6469..7707123511 100644 --- a/src/qml/doc/snippets/qml/qtobject.qml +++ b/src/qml/doc/snippets/qml/qtobject.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 +import QtQuick Item { QtObject { diff --git a/src/qml/doc/snippets/qml/reusablecomponents/Button.qml b/src/qml/doc/snippets/qml/reusablecomponents/Button.qml index 254d41fc69..5554befa3e 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/Button.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/Button.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] //contents of Button.qml -import QtQuick 2.0 +import QtQuick //! [parent begin] Rectangle { diff --git a/src/qml/doc/snippets/qml/reusablecomponents/application.qml b/src/qml/doc/snippets/qml/reusablecomponents/application.qml index 69d53cab8f..7c40bda2b6 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/application.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/application.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Rectangle { width: 175; height: 350 diff --git a/src/qml/doc/snippets/qml/reusablecomponents/component.qml b/src/qml/doc/snippets/qml/reusablecomponents/component.qml index 9a5662d4e0..ba70f0b9e2 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/component.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/component.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick //! [parent begin] Rectangle { diff --git a/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml b/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml index 46af8879af..be1feabe67 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] //contents of focusbutton.qml -import QtQuick 2.0 +import QtQuick //! [parent begin] FocusScope { -- cgit v1.2.3