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/qmlmodels/doc/snippets/delegatemodel/delegatemodel.qml | 4 ++-- .../doc/snippets/delegatemodel/delegatemodel_rootindex/view.qml | 4 ++-- src/qmlmodels/doc/snippets/delegatemodel/delegatemodelgroup.qml | 4 ++-- src/qmlmodels/doc/snippets/package/Delegate.qml | 2 +- src/qmlmodels/doc/snippets/package/view.qml | 4 ++-- src/qmlmodels/doc/snippets/qml/listmodel/listelements.qml | 2 +- src/qmlmodels/doc/snippets/qml/listmodel/listmodel-modify.qml | 2 +- src/qmlmodels/doc/snippets/qml/listmodel/listmodel-nested.qml | 2 +- src/qmlmodels/doc/snippets/qml/listmodel/listmodel-simple.qml | 2 +- src/qmlmodels/doc/snippets/qml/listmodel/listmodel.qml | 2 +- src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-complex.qml | 6 +++--- .../doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml | 6 +++--- .../doc/snippets/qml/tablemodel/fruit-example-simpledelegate.qml | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/qmlmodels/doc') diff --git a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel.qml b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel.qml index a2f12d5567..51bba64534 100644 --- a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel.qml +++ b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 -import QtQml.Models 2.2 +import QtQuick +import QtQml.Models Rectangle { width: 200; height: 100 diff --git a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel_rootindex/view.qml b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel_rootindex/view.qml index b124bb7b2a..01abaf1909 100644 --- a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel_rootindex/view.qml +++ b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodel_rootindex/view.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 -import QtQml.Models 2.2 +import QtQuick +import QtQml.Models ListView { id: view diff --git a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodelgroup.qml b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodelgroup.qml index 0325d7f7f3..1f55f0d193 100644 --- a/src/qmlmodels/doc/snippets/delegatemodel/delegatemodelgroup.qml +++ b/src/qmlmodels/doc/snippets/delegatemodel/delegatemodelgroup.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![0] -import QtQuick 2.0 -import QtQml.Models 2.2 +import QtQuick +import QtQml.Models Rectangle { width: 200; height: 100 diff --git a/src/qmlmodels/doc/snippets/package/Delegate.qml b/src/qmlmodels/doc/snippets/package/Delegate.qml index 48edb90125..d671c15b26 100644 --- a/src/qmlmodels/doc/snippets/package/Delegate.qml +++ b/src/qmlmodels/doc/snippets/package/Delegate.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] Package { diff --git a/src/qmlmodels/doc/snippets/package/view.qml b/src/qmlmodels/doc/snippets/package/view.qml index e0c43dad55..4df31a8498 100644 --- a/src/qmlmodels/doc/snippets/package/view.qml +++ b/src/qmlmodels/doc/snippets/package/view.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 -import QtQml.Models 2.1 +import QtQuick +import QtQml.Models Rectangle { id: root diff --git a/src/qmlmodels/doc/snippets/qml/listmodel/listelements.qml b/src/qmlmodels/doc/snippets/qml/listmodel/listelements.qml index bab4aec6a2..e2a1525534 100644 --- a/src/qmlmodels/doc/snippets/qml/listmodel/listelements.qml +++ b/src/qmlmodels/doc/snippets/qml/listmodel/listelements.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [document] -import QtQuick 2.0 +import QtQuick Item { width: 200; height: 250 diff --git a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-modify.qml b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-modify.qml index 3178abfcfd..99d6a3adc7 100644 --- a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-modify.qml +++ b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-modify.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 Rectangle { width: 200; height: 200 diff --git a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-nested.qml b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-nested.qml index 15a5fc858f..8018f7b69f 100644 --- a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-nested.qml +++ b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-nested.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 Rectangle { width: 200; height: 200 diff --git a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-simple.qml b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-simple.qml index 2640a38f13..8ba0a6d182 100644 --- a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-simple.qml +++ b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel-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 Rectangle { width: 200; height: 200 diff --git a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel.qml b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel.qml index 05deec06b6..3eefc4b9a5 100644 --- a/src/qmlmodels/doc/snippets/qml/listmodel/listmodel.qml +++ b/src/qmlmodels/doc/snippets/qml/listmodel/listmodel.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 ListModel { id: fruitModel diff --git a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-complex.qml b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-complex.qml index ab44bf5696..70ce56f599 100644 --- a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-complex.qml +++ b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-complex.qml @@ -2,9 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![file] -import QtQuick 2.12 -import QtQuick.Window 2.12 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Window +import Qt.labs.qmlmodels Window { width: 400 diff --git a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml index 45c6f1818d..5241317c4d 100644 --- a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml +++ b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml @@ -2,9 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![file] -import QtQuick 2.12 -import QtQuick.Controls 2.5 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Controls +import Qt.labs.qmlmodels ApplicationWindow { width: 400 diff --git a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-simpledelegate.qml b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-simpledelegate.qml index e00ae6bfc0..0c9622c440 100644 --- a/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-simpledelegate.qml +++ b/src/qmlmodels/doc/snippets/qml/tablemodel/fruit-example-simpledelegate.qml @@ -2,9 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //![file] -import QtQuick 2.12 -import QtQuick.Window 2.12 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Window +import Qt.labs.qmlmodels Window { width: 400 -- cgit v1.2.3