From ccb3fece7d9306bf2c02fcd80505d6a4c3822f35 Mon Sep 17 00:00:00 2001 From: Balazs Egedi Date: Thu, 1 Jul 2021 16:06:32 +0200 Subject: Remove import versions from Quick examples Task-number: QTBUG-93666 Change-Id: I035ceab5bf3f0194ef9f98ccb3f79317f15c968a Reviewed-by: Michal Klocek (cherry picked from commit 6b9b4b6ec334e47c9bed4fc74a8568481bcd5b7c) Reviewed-by: Allan Sandfeld Jensen --- examples/webengine/lifecycle/WebBrowser.qml | 10 +++++----- examples/webengine/lifecycle/WebTab.qml | 12 ++++++------ examples/webengine/lifecycle/WebTabBar.qml | 8 ++++---- examples/webengine/lifecycle/WebTabButton.qml | 10 +++++----- examples/webengine/lifecycle/WebTabStack.qml | 6 +++--- examples/webengine/lifecycle/WebToolButton.qml | 6 +++--- examples/webengine/minimal/main.qml | 6 +++--- .../webengine/recipebrowser/resources/qml/RecipeList.qml | 8 ++++---- examples/webengine/recipebrowser/resources/qml/main.qml | 14 +++++++------- examples/webengine/webengineaction/main.qml | 10 +++++----- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/examples/webengine/lifecycle/WebBrowser.qml b/examples/webengine/lifecycle/WebBrowser.qml index 23c2500e2..e29ac4f90 100644 --- a/examples/webengine/lifecycle/WebBrowser.qml +++ b/examples/webengine/lifecycle/WebBrowser.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts +import QtQuick.Window ApplicationWindow { id: root diff --git a/examples/webengine/lifecycle/WebTab.qml b/examples/webengine/lifecycle/WebTab.qml index 8649da3cb..f83ce9404 100644 --- a/examples/webengine/lifecycle/WebTab.qml +++ b/examples/webengine/lifecycle/WebTab.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQml 2.12 -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 -import QtWebEngine 1.10 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts +import QtWebEngine ColumnLayout { id: root diff --git a/examples/webengine/lifecycle/WebTabBar.qml b/examples/webengine/lifecycle/WebTabBar.qml index 326ad39d2..b883cfc36 100644 --- a/examples/webengine/lifecycle/WebTabBar.qml +++ b/examples/webengine/lifecycle/WebTabBar.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts Pane { id: root diff --git a/examples/webengine/lifecycle/WebTabButton.qml b/examples/webengine/lifecycle/WebTabButton.qml index 68057412b..50bc463da 100644 --- a/examples/webengine/lifecycle/WebTabButton.qml +++ b/examples/webengine/lifecycle/WebTabButton.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 -import QtWebEngine 1.10 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts +import QtWebEngine TabButton { id: root diff --git a/examples/webengine/lifecycle/WebTabStack.qml b/examples/webengine/lifecycle/WebTabStack.qml index 75cbba861..6ceedb8a5 100644 --- a/examples/webengine/lifecycle/WebTabStack.qml +++ b/examples/webengine/lifecycle/WebTabStack.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQml.Models 2.12 -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQml.Models +import QtQuick +import QtQuick.Controls Rectangle { id: root diff --git a/examples/webengine/lifecycle/WebToolButton.qml b/examples/webengine/lifecycle/WebToolButton.qml index 958c083cd..9565dfb1d 100644 --- a/examples/webengine/lifecycle/WebToolButton.qml +++ b/examples/webengine/lifecycle/WebToolButton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material ToolButton { id: root diff --git a/examples/webengine/minimal/main.qml b/examples/webengine/minimal/main.qml index 75082f9c5..d32176662 100644 --- a/examples/webengine/minimal/main.qml +++ b/examples/webengine/minimal/main.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.0 -import QtWebEngine 1.0 +import QtQuick +import QtQuick.Window +import QtWebEngine Window { width: 1024 diff --git a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml index 41806986c..e4ec684ac 100644 --- a/examples/webengine/recipebrowser/resources/qml/RecipeList.qml +++ b/examples/webengine/recipebrowser/resources/qml/RecipeList.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts FocusScope { id: root diff --git a/examples/webengine/recipebrowser/resources/qml/main.qml b/examples/webengine/recipebrowser/resources/qml/main.qml index a9893ed67..927b4424f 100644 --- a/examples/webengine/recipebrowser/resources/qml/main.qml +++ b/examples/webengine/recipebrowser/resources/qml/main.qml @@ -48,13 +48,13 @@ ** ****************************************************************************/ -import QtQml 2.0 -import QtQuick 2.1 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Window 2.0 -import QtWebEngine 1.4 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Layouts +import QtQuick.Window +import QtWebEngine ApplicationWindow { id: appWindow diff --git a/examples/webengine/webengineaction/main.qml b/examples/webengine/webengineaction/main.qml index a3933ee41..fbb76411e 100644 --- a/examples/webengine/webengineaction/main.qml +++ b/examples/webengine/webengineaction/main.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.0 -import QtWebEngine 1.7 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 +import QtQuick +import QtQuick.Window +import QtWebEngine +import QtQuick.Controls +import QtQuick.Layouts ApplicationWindow { id: window -- cgit v1.2.3