aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/chattutorial
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-26 17:01:51 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-08-26 11:46:00 +0200
commitd451cab0c8b727fa7f12a169a3d6ee449a3a1902 (patch)
tree8ce125b91fa050fdc0e9f0a1b95408fa5ab74f9d /examples/quickcontrols2/chattutorial
parent44847322109bd237498f3f74c4784bf27757a810 (diff)
Remove all version numbers from QML imports
As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/quickcontrols2/chattutorial')
-rw-r--r--examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter2-lists/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml8
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/main.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml4
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml6
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml8
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/main.qml4
13 files changed, 32 insertions, 32 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
index 29e5c300..3dc93e47 100644
--- a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 540
diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
index 8308f5c0..66a51d2d 100644
--- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 540
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
index 826aee42..080d8bdb 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
index 94942191..2ae56444 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
index 3c0d1a23..029f45e3 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
index 61819491..c8e88724 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
-import io.qt.examples.chattutorial 1.0
+import io.qt.examples.chattutorial
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
index d616fa38..35f770f5 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
@@ -48,11 +48,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
-import io.qt.examples.chattutorial 1.0
+import io.qt.examples.chattutorial
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
index 3c0d1a23..029f45e3 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
index 1252706b..d4a66764 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls
+import QtQuick.Controls.Material
ToolBar {
Material.theme: Material.Dark
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
index 32e6217c..c192aeb5 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick.Controls 2.12
+import QtQuick.Controls
ToolBar {
}
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
index f26712f8..65460bf1 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
-import io.qt.examples.chattutorial 1.0
+import io.qt.examples.chattutorial
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
index 31238454..c668072e 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
@@ -48,11 +48,11 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
-import io.qt.examples.chattutorial 1.0
+import io.qt.examples.chattutorial
Page {
id: root
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
index 3c0d1a23..029f45e3 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window