examples: Do not use versioned QML import

Ignore .ui.qml files though for now, until they are properly handled
by Qt Design Studio.

Task-number: QTBUG-89033
Change-Id: I85ea1dc2f85928e9fa1f473535687ab8b0288e9d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

78 files changed, 115 insertions, 116 deletions

diff --git a/examples/demos/calqlatr/calqlatr.qml b/examples/demos/calqlatr/calqlatr.qml
index 769513b7b..75d402d4b 100644
--- a/examples/demos/calqlatr/calqlatr.qml
+++ b/examples/demos/calqlatr/calqlatr.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "content"
 import "content/calculator.js" as CalcEngine
 
diff --git a/examples/demos/calqlatr/content/Button.qml b/examples/demos/calqlatr/content/Button.qml
index 5279596ef..41887b602 100644
--- a/examples/demos/calqlatr/content/Button.qml
+++ b/examples/demos/calqlatr/content/Button.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: button
diff --git a/examples/demos/calqlatr/content/Display.qml b/examples/demos/calqlatr/content/Display.qml
index 9ddd64d25..ef1ef029b 100644
--- a/examples/demos/calqlatr/content/Display.qml
+++ b/examples/demos/calqlatr/content/Display.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick
+import QtQuick.Window
 
 Item {
     id: display
diff --git a/examples/demos/calqlatr/content/NumberPad.qml b/examples/demos/calqlatr/content/NumberPad.qml
index 9936116fa..fde66cb47 100644
--- a/examples/demos/calqlatr/content/NumberPad.qml
+++ b/examples/demos/calqlatr/content/NumberPad.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Grid {
     columns: 3
diff --git a/examples/demos/clocks/clocks.qml b/examples/demos/clocks/clocks.qml
index 5224e29a3..289994336 100644
--- a/examples/demos/clocks/clocks.qml
+++ b/examples/demos/clocks/clocks.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "content" as Content
 
 Rectangle {
diff --git a/examples/demos/clocks/content/Clock.qml b/examples/demos/clocks/content/Clock.qml
index 542333d13..457b2c357 100644
--- a/examples/demos/clocks/content/Clock.qml
+++ b/examples/demos/clocks/content/Clock.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id : clock
diff --git a/examples/demos/coffee/ApplicationFlow.qml b/examples/demos/coffee/ApplicationFlow.qml
index 797c54a1d..d94218d10 100644
--- a/examples/demos/coffee/ApplicationFlow.qml
+++ b/examples/demos/coffee/ApplicationFlow.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
-import Coffee 1.0
+import QtQuick
+import Coffee
 
 ApplicationFlowForm {
     id: applicationFlow
diff --git a/examples/demos/coffee/Brewing.qml b/examples/demos/coffee/Brewing.qml
index cb763db26..6aed5ae5b 100644
--- a/examples/demos/coffee/Brewing.qml
+++ b/examples/demos/coffee/Brewing.qml
@@ -48,8 +48,7 @@
 **
 ****************************************************************************/
 
-
-import QtQuick 2.4
+import QtQuick
 
 //! [0]
 BrewingForm {
diff --git a/examples/demos/coffee/CoffeeButton.qml b/examples/demos/coffee/CoffeeButton.qml
index c0200894d..db90eb4fe 100644
--- a/examples/demos/coffee/CoffeeButton.qml
+++ b/examples/demos/coffee/CoffeeButton.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-import Coffee 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Coffee
 
 Image {
     id: root
diff --git a/examples/demos/coffee/Cup.qml b/examples/demos/coffee/Cup.qml
index dc7508b61..c528e7264 100644
--- a/examples/demos/coffee/Cup.qml
+++ b/examples/demos/coffee/Cup.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
+import QtQuick
 
 CupForm {
 }
diff --git a/examples/demos/coffee/EmptyCup.qml b/examples/demos/coffee/EmptyCup.qml
index ee960e673..6b604dedf 100644
--- a/examples/demos/coffee/EmptyCup.qml
+++ b/examples/demos/coffee/EmptyCup.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
+import QtQuick
 
 EmptyCupForm {
 }
diff --git a/examples/demos/coffee/SideBar.qml b/examples/demos/coffee/SideBar.qml
index b200ececf..e47bd525a 100644
--- a/examples/demos/coffee/SideBar.qml
+++ b/examples/demos/coffee/SideBar.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
+import QtQuick
 
 SideBarForm {
     id: sideBar
diff --git a/examples/demos/coffee/imports/Coffee/Constants.qml b/examples/demos/coffee/imports/Coffee/Constants.qml
index 159364a3a..09cc4f8c5 100644
--- a/examples/demos/coffee/imports/Coffee/Constants.qml
+++ b/examples/demos/coffee/imports/Coffee/Constants.qml
@@ -50,7 +50,7 @@
 
 
 pragma Singleton
-import QtQuick 2.6
+import QtQuick
 
 QtObject {
     property FontLoader fontLoader: FontLoader {
diff --git a/examples/demos/coffee/main.qml b/examples/demos/coffee/main.qml
index 56f4656b0..69d6f6d8e 100644
--- a/examples/demos/coffee/main.qml
+++ b/examples/demos/coffee/main.qml
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-import Coffee 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Coffee
 
 ApplicationWindow {
     visible: true
diff --git a/examples/demos/maroon/content/BuildButton.qml b/examples/demos/maroon/content/BuildButton.qml
index 09d37746f..a4d1c3af4 100644
--- a/examples/demos/maroon/content/BuildButton.qml
+++ b/examples/demos/maroon/content/BuildButton.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "logic.js" as Logic
 
 Item {
diff --git a/examples/demos/maroon/content/GameCanvas.qml b/examples/demos/maroon/content/GameCanvas.qml
index 0c6772dc9..ad2ee27a9 100644
--- a/examples/demos/maroon/content/GameCanvas.qml
+++ b/examples/demos/maroon/content/GameCanvas.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "logic.js" as Logic
 import "towers" as Towers
 
diff --git a/examples/demos/maroon/content/GameOverScreen.qml b/examples/demos/maroon/content/GameOverScreen.qml
index 6de3b13ba..b7dcdfe1c 100644
--- a/examples/demos/maroon/content/GameOverScreen.qml
+++ b/examples/demos/maroon/content/GameOverScreen.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 import "logic.js" as Logic
 
 Item {
diff --git a/examples/demos/maroon/content/InfoBar.qml b/examples/demos/maroon/content/InfoBar.qml
index 8176b1a37..cf46ce5f3 100644
--- a/examples/demos/maroon/content/InfoBar.qml
+++ b/examples/demos/maroon/content/InfoBar.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     height: childrenRect.height
diff --git a/examples/demos/maroon/content/NewGameScreen.qml b/examples/demos/maroon/content/NewGameScreen.qml
index d87e6b36f..0ba528b1d 100644
--- a/examples/demos/maroon/content/NewGameScreen.qml
+++ b/examples/demos/maroon/content/NewGameScreen.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 // This is the first screen.
 // It shows the logo and emit a startButtonClicked signal
diff --git a/examples/demos/maroon/content/SoundEffect.qml b/examples/demos/maroon/content/SoundEffect.qml
index 35a68eb5e..1f742d7af 100644
--- a/examples/demos/maroon/content/SoundEffect.qml
+++ b/examples/demos/maroon/content/SoundEffect.qml
@@ -48,11 +48,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 //Proxies a SoundEffect if QtMultimedia is installed
 Item {
     id: container
-    property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "'; muted: Qt.application.state != Qt.ApplicationActive }", container);
+    property QtObject effect: Qt.createQmlObject("import QtMultimedia; SoundEffect{ source: '" + container.source + "'; muted: Qt.application.state != Qt.ApplicationActive }",container);
     property url source: ""
     onSourceChanged: if (effect != null) effect.source = source;
     function play() {
diff --git a/examples/demos/maroon/content/logic.js b/examples/demos/maroon/content/logic.js
index 3830b5ad6..f8d5d927f 100644
--- a/examples/demos/maroon/content/logic.js
+++ b/examples/demos/maroon/content/logic.js
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 .pragma library // Shared game state
-.import QtQuick 2.0 as QQ
+.import QtQuick as QQ
 
 // Game Stuff
 var gameState // Local reference
diff --git a/examples/demos/maroon/content/mobs/MobBase.qml b/examples/demos/maroon/content/mobs/MobBase.qml
index 584623fa7..51f38d33e 100644
--- a/examples/demos/maroon/content/mobs/MobBase.qml
+++ b/examples/demos/maroon/content/mobs/MobBase.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "../logic.js" as Logic
 import ".."
 
diff --git a/examples/demos/maroon/content/towers/Bomb.qml b/examples/demos/maroon/content/towers/Bomb.qml
index e33d71d2e..b894068ea 100644
--- a/examples/demos/maroon/content/towers/Bomb.qml
+++ b/examples/demos/maroon/content/towers/Bomb.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "../logic.js" as Logic
 import ".."
 
diff --git a/examples/demos/maroon/content/towers/Factory.qml b/examples/demos/maroon/content/towers/Factory.qml
index 6b688e051..9720b6d3b 100644
--- a/examples/demos/maroon/content/towers/Factory.qml
+++ b/examples/demos/maroon/content/towers/Factory.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "../logic.js" as Logic
 import ".."
 
diff --git a/examples/demos/maroon/content/towers/Melee.qml b/examples/demos/maroon/content/towers/Melee.qml
index f83bd4c52..0107c7876 100644
--- a/examples/demos/maroon/content/towers/Melee.qml
+++ b/examples/demos/maroon/content/towers/Melee.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import ".."
 
 TowerBase {
diff --git a/examples/demos/maroon/content/towers/Ranged.qml b/examples/demos/maroon/content/towers/Ranged.qml
index 2c1f5d134..922d7e502 100644
--- a/examples/demos/maroon/content/towers/Ranged.qml
+++ b/examples/demos/maroon/content/towers/Ranged.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "../logic.js" as Logic
 import ".."
 
diff --git a/examples/demos/maroon/content/towers/TowerBase.qml b/examples/demos/maroon/content/towers/TowerBase.qml
index be37d732e..3dfaaf1b2 100644
--- a/examples/demos/maroon/content/towers/TowerBase.qml
+++ b/examples/demos/maroon/content/towers/TowerBase.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     property real hp: 1
diff --git a/examples/demos/maroon/maroon.qml b/examples/demos/maroon/maroon.qml
index d05ef57b6..91d1d2cb6 100644
--- a/examples/demos/maroon/maroon.qml
+++ b/examples/demos/maroon/maroon.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 import "content"
 import "content/logic.js" as Logic
 
diff --git a/examples/demos/photosurface/doc/src/photosurface.qdoc b/examples/demos/photosurface/doc/src/photosurface.qdoc
index 2c96c2c3e..af628a141 100644
--- a/examples/demos/photosurface/doc/src/photosurface.qdoc
+++ b/examples/demos/photosurface/doc/src/photosurface.qdoc
@@ -58,7 +58,7 @@
     To use the \l{Window} type, we must import it:
 
     \code
-    import QtQuick.Window 2.1
+    import QtQuick.Window
     \endcode
 
     \section1 Accessing Folder Contents
@@ -73,7 +73,7 @@
     To use the FolderListModel type, we must import it:
 
     \code
-    import Qt.labs.folderlistmodel 1.0
+    import Qt.labs.folderlistmodel
     \endcode
 
     We use a FolderDialog to enable users to select the folder that contains
@@ -86,7 +86,7 @@
     To use the FolderDialog type, we add the following import statement:
 
     \code
-    import Qt.labs.platform 1.1
+    import Qt.labs.platform
     \endcode
 
     We use the \c {folderDialog.open()} function to open the file dialog when the
diff --git a/examples/demos/photosurface/photosurface.qml b/examples/demos/photosurface/photosurface.qml
index abdef5bda..d8f59be6b 100644
--- a/examples/demos/photosurface/photosurface.qml
+++ b/examples/demos/photosurface/photosurface.qml
@@ -47,10 +47,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Window 2.1
-import Qt.labs.folderlistmodel 1.0
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Window
+import Qt.labs.folderlistmodel
+import Qt.labs.platform
 
 Window {
     id: root
diff --git a/examples/demos/samegame/content/Block.qml b/examples/demos/samegame/content/Block.qml
index 5c6e584e3..6a5563e6e 100644
--- a/examples/demos/samegame/content/Block.qml
+++ b/examples/demos/samegame/content/Block.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     id: block
diff --git a/examples/demos/samegame/content/BlockEmitter.qml b/examples/demos/samegame/content/BlockEmitter.qml
index cbcc5df99..9574eaa67 100644
--- a/examples/demos/samegame/content/BlockEmitter.qml
+++ b/examples/demos/samegame/content/BlockEmitter.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 // Needed for singletons QTBUG-34418
 import "."
 
diff --git a/examples/demos/samegame/content/Button.qml b/examples/demos/samegame/content/Button.qml
index baaa7c73b..a21e3c813 100644
--- a/examples/demos/samegame/content/Button.qml
+++ b/examples/demos/samegame/content/Button.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     property alias imgSrc: image.source
diff --git a/examples/demos/samegame/content/GameArea.qml b/examples/demos/samegame/content/GameArea.qml
index 0f51fcf00..b40ff10c0 100644
--- a/examples/demos/samegame/content/GameArea.qml
+++ b/examples/demos/samegame/content/GameArea.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 import "samegame.js" as Logic
 import "."
 
diff --git a/examples/demos/samegame/content/LogoAnimation.qml b/examples/demos/samegame/content/LogoAnimation.qml
index fd89ea816..b8e2c5bfb 100644
--- a/examples/demos/samegame/content/LogoAnimation.qml
+++ b/examples/demos/samegame/content/LogoAnimation.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     id: container //Positioned where the 48x48 S/G should be
diff --git a/examples/demos/samegame/content/MenuEmitter.qml b/examples/demos/samegame/content/MenuEmitter.qml
index 20cbb2c1a..95c716eed 100644
--- a/examples/demos/samegame/content/MenuEmitter.qml
+++ b/examples/demos/samegame/content/MenuEmitter.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Emitter {
     anchors.fill: parent
diff --git a/examples/demos/samegame/content/PaintEmitter.qml b/examples/demos/samegame/content/PaintEmitter.qml
index dd67c966a..a8ac89798 100644
--- a/examples/demos/samegame/content/PaintEmitter.qml
+++ b/examples/demos/samegame/content/PaintEmitter.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 import "."
 
 Emitter {
diff --git a/examples/demos/samegame/content/PrimaryPack.qml b/examples/demos/samegame/content/PrimaryPack.qml
index 0e3b77087..4d6e1dc48 100644
--- a/examples/demos/samegame/content/PrimaryPack.qml
+++ b/examples/demos/samegame/content/PrimaryPack.qml
@@ -49,8 +49,8 @@
 ****************************************************************************/
 
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     id: container
diff --git a/examples/demos/samegame/content/PuzzleBlock.qml b/examples/demos/samegame/content/PuzzleBlock.qml
index f65b79d51..f7d181714 100644
--- a/examples/demos/samegame/content/PuzzleBlock.qml
+++ b/examples/demos/samegame/content/PuzzleBlock.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     id: block
diff --git a/examples/demos/samegame/content/SamegameText.qml b/examples/demos/samegame/content/SamegameText.qml
index c69272bad..5b490e52d 100644
--- a/examples/demos/samegame/content/SamegameText.qml
+++ b/examples/demos/samegame/content/SamegameText.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "."
 
 Text {
diff --git a/examples/demos/samegame/content/Settings.qml b/examples/demos/samegame/content/Settings.qml
index 2892198b2..930528440 100644
--- a/examples/demos/samegame/content/Settings.qml
+++ b/examples/demos/samegame/content/Settings.qml
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQml 2.0
+import QtQml
 
 QtObject {
     property int screenHeight: 480
diff --git a/examples/demos/samegame/content/SimpleBlock.qml b/examples/demos/samegame/content/SimpleBlock.qml
index eb2c458d4..889fd3726 100644
--- a/examples/demos/samegame/content/SimpleBlock.qml
+++ b/examples/demos/samegame/content/SimpleBlock.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     id: block
diff --git a/examples/demos/samegame/content/SmokeText.qml b/examples/demos/samegame/content/SmokeText.qml
index 1fc72010d..9d4a7076e 100644
--- a/examples/demos/samegame/content/SmokeText.qml
+++ b/examples/demos/samegame/content/SmokeText.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 
 Item {
     z: 10
diff --git a/examples/demos/samegame/content/levels/TemplateBase.qml b/examples/demos/samegame/content/levels/TemplateBase.qml
index 6501f277e..9940133a1 100644
--- a/examples/demos/samegame/content/levels/TemplateBase.qml
+++ b/examples/demos/samegame/content/levels/TemplateBase.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Rectangle{
     id: control
diff --git a/examples/demos/samegame/content/levels/level0.qml b/examples/demos/samegame/content/levels/level0.qml
index 3c09b1f3d..555c7e951 100644
--- a/examples/demos/samegame/content/levels/level0.qml
+++ b/examples/demos/samegame/content/levels/level0.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     moveTarget: 3
diff --git a/examples/demos/samegame/content/levels/level1.qml b/examples/demos/samegame/content/levels/level1.qml
index 29ad09cf0..a0b597087 100644
--- a/examples/demos/samegame/content/levels/level1.qml
+++ b/examples/demos/samegame/content/levels/level1.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     timeTarget: 10
diff --git a/examples/demos/samegame/content/levels/level2.qml b/examples/demos/samegame/content/levels/level2.qml
index 830776223..6e4b7b454 100644
--- a/examples/demos/samegame/content/levels/level2.qml
+++ b/examples/demos/samegame/content/levels/level2.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     scoreTarget: 1200
diff --git a/examples/demos/samegame/content/levels/level3.qml b/examples/demos/samegame/content/levels/level3.qml
index 91b03a165..c0b0a21dd 100644
--- a/examples/demos/samegame/content/levels/level3.qml
+++ b/examples/demos/samegame/content/levels/level3.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     scoreTarget: 3000
diff --git a/examples/demos/samegame/content/levels/level4.qml b/examples/demos/samegame/content/levels/level4.qml
index 589d38684..893904fec 100644
--- a/examples/demos/samegame/content/levels/level4.qml
+++ b/examples/demos/samegame/content/levels/level4.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     goalText: "5 of 10<br><br>Clear the level..."
diff --git a/examples/demos/samegame/content/levels/level5.qml b/examples/demos/samegame/content/levels/level5.qml
index 78ee6eb35..45c49b841 100644
--- a/examples/demos/samegame/content/levels/level5.qml
+++ b/examples/demos/samegame/content/levels/level5.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     moveTarget: 4
diff --git a/examples/demos/samegame/content/levels/level6.qml b/examples/demos/samegame/content/levels/level6.qml
index 3e56808dc..bae57b4ce 100644
--- a/examples/demos/samegame/content/levels/level6.qml
+++ b/examples/demos/samegame/content/levels/level6.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     moveTarget: 20
diff --git a/examples/demos/samegame/content/levels/level7.qml b/examples/demos/samegame/content/levels/level7.qml
index 2e412a0c7..0eb6a6163 100644
--- a/examples/demos/samegame/content/levels/level7.qml
+++ b/examples/demos/samegame/content/levels/level7.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     goalText: "8 of 10<br><br>Clear the grid."
diff --git a/examples/demos/samegame/content/levels/level8.qml b/examples/demos/samegame/content/levels/level8.qml
index 18daa7628..4e89ff0f3 100644
--- a/examples/demos/samegame/content/levels/level8.qml
+++ b/examples/demos/samegame/content/levels/level8.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     scoreTarget: 1000
diff --git a/examples/demos/samegame/content/levels/level9.qml b/examples/demos/samegame/content/levels/level9.qml
index 38d667318..085412892 100644
--- a/examples/demos/samegame/content/levels/level9.qml
+++ b/examples/demos/samegame/content/levels/level9.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 TemplateBase{
     scoreTarget: 2000
diff --git a/examples/demos/samegame/content/samegame.js b/examples/demos/samegame/content/samegame.js
index 0e2cd4ea5..0bbf9d541 100644
--- a/examples/demos/samegame/content/samegame.js
+++ b/examples/demos/samegame/content/samegame.js
@@ -50,7 +50,7 @@
 
 /* This script file handles the game logic */
 .pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
+.import QtQuick.LocalStorage as Sql
 
 var maxColumn = 10;
 var maxRow = 13;
diff --git a/examples/demos/samegame/samegame.qml b/examples/demos/samegame/samegame.qml
index 6045c512f..4ffab46b1 100644
--- a/examples/demos/samegame/samegame.qml
+++ b/examples/demos/samegame/samegame.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Particles 2.0
+import QtQuick
+import QtQuick.Particles
 import "content/samegame.js" as Logic
 import "content"
 
diff --git a/examples/demos/stocqt/content/+windows/Settings.qml b/examples/demos/stocqt/content/+windows/Settings.qml
index 137ec546c..0f8c2c93a 100644
--- a/examples/demos/stocqt/content/+windows/Settings.qml
+++ b/examples/demos/stocqt/content/+windows/Settings.qml
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQml 2.0
+import QtQml
 
 QtObject {
     property string fontFamily: "Arial"
diff --git a/examples/demos/stocqt/content/Banner.qml b/examples/demos/stocqt/content/Banner.qml
index bcba12204..e67b4affd 100644
--- a/examples/demos/stocqt/content/Banner.qml
+++ b/examples/demos/stocqt/content/Banner.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Layouts
 
 Rectangle {
     id: banner
diff --git a/examples/demos/stocqt/content/Button.qml b/examples/demos/stocqt/content/Button.qml
index ed9b4ed49..d24d173ea 100644
--- a/examples/demos/stocqt/content/Button.qml
+++ b/examples/demos/stocqt/content/Button.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/CheckBox.qml b/examples/demos/stocqt/content/CheckBox.qml
index 9f9138963..bc1cdf1f7 100644
--- a/examples/demos/stocqt/content/CheckBox.qml
+++ b/examples/demos/stocqt/content/CheckBox.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: button
diff --git a/examples/demos/stocqt/content/Settings.qml b/examples/demos/stocqt/content/Settings.qml
index 9c7c59ed7..ab515033d 100644
--- a/examples/demos/stocqt/content/Settings.qml
+++ b/examples/demos/stocqt/content/Settings.qml
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 pragma Singleton
-import QtQml 2.0
+import QtQml
 
 QtObject {
     property string fontFamily: "Open Sans"
diff --git a/examples/demos/stocqt/content/StockChart.qml b/examples/demos/stocqt/content/StockChart.qml
index 0af06a8d5..1e93c3885 100644
--- a/examples/demos/stocqt/content/StockChart.qml
+++ b/examples/demos/stocqt/content/StockChart.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Layouts
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/StockInfo.qml b/examples/demos/stocqt/content/StockInfo.qml
index e18f34e83..409eac75f 100644
--- a/examples/demos/stocqt/content/StockInfo.qml
+++ b/examples/demos/stocqt/content/StockInfo.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Layouts
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/StockListDelegate.qml b/examples/demos/stocqt/content/StockListDelegate.qml
index 8a4a8f692..fd7fb65b7 100644
--- a/examples/demos/stocqt/content/StockListDelegate.qml
+++ b/examples/demos/stocqt/content/StockListDelegate.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.5
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Layouts
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/StockListModel.qml b/examples/demos/stocqt/content/StockListModel.qml
index 2f697f564..4b1b0f6a6 100644
--- a/examples/demos/stocqt/content/StockListModel.qml
+++ b/examples/demos/stocqt/content/StockListModel.qml
@@ -47,7 +47,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
+import QtQuick
 
 ListModel {
     id: stocks
diff --git a/examples/demos/stocqt/content/StockListView.qml b/examples/demos/stocqt/content/StockListView.qml
index e30355c67..0ba7fc2a8 100644
--- a/examples/demos/stocqt/content/StockListView.qml
+++ b/examples/demos/stocqt/content/StockListView.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/StockModel.qml b/examples/demos/stocqt/content/StockModel.qml
index 9e3a815c1..e36847ab8 100644
--- a/examples/demos/stocqt/content/StockModel.qml
+++ b/examples/demos/stocqt/content/StockModel.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 ListModel {
     id: model
diff --git a/examples/demos/stocqt/content/StockSettingsPanel.qml b/examples/demos/stocqt/content/StockSettingsPanel.qml
index 48a77d849..7f6dc3429 100644
--- a/examples/demos/stocqt/content/StockSettingsPanel.qml
+++ b/examples/demos/stocqt/content/StockSettingsPanel.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Layouts
 import "."
 
 Rectangle {
diff --git a/examples/demos/stocqt/content/StockView.qml b/examples/demos/stocqt/content/StockView.qml
index f966f06b1..2a224859a 100644
--- a/examples/demos/stocqt/content/StockView.qml
+++ b/examples/demos/stocqt/content/StockView.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Window 2.1
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQuick.Window
+import QtQuick.Layouts
 
 Rectangle {
     id: root
diff --git a/examples/demos/stocqt/stocqt.qml b/examples/demos/stocqt/stocqt.qml
index 1657003e5..5bb9ca041 100644
--- a/examples/demos/stocqt/stocqt.qml
+++ b/examples/demos/stocqt/stocqt.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQml.Models 2.1
-import QtQuick.Layouts 1.1
+import QtQuick
+import QtQml.Models
+import QtQuick.Layouts
 import "./content"
 
 Rectangle {
diff --git a/examples/demos/tweetsearch/content/FlipBar.qml b/examples/demos/tweetsearch/content/FlipBar.qml
index 04ac8d4f1..e1b788cac 100644
--- a/examples/demos/tweetsearch/content/FlipBar.qml
+++ b/examples/demos/tweetsearch/content/FlipBar.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     id: container
diff --git a/examples/demos/tweetsearch/content/LineInput.qml b/examples/demos/tweetsearch/content/LineInput.qml
index 1ef8fd9f5..7ae0b6816 100644
--- a/examples/demos/tweetsearch/content/LineInput.qml
+++ b/examples/demos/tweetsearch/content/LineInput.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 FocusScope {
     id: wrapper
diff --git a/examples/demos/tweetsearch/content/ListFooter.qml b/examples/demos/tweetsearch/content/ListFooter.qml
index 40e9467c4..db4b79aff 100644
--- a/examples/demos/tweetsearch/content/ListFooter.qml
+++ b/examples/demos/tweetsearch/content/ListFooter.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Rectangle {
     color: "#d6d6d6"
diff --git a/examples/demos/tweetsearch/content/ListHeader.qml b/examples/demos/tweetsearch/content/ListHeader.qml
index 8c4facf34..26d091c20 100644
--- a/examples/demos/tweetsearch/content/ListHeader.qml
+++ b/examples/demos/tweetsearch/content/ListHeader.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 Item {
     height: 60
diff --git a/examples/demos/tweetsearch/content/SearchDelegate.qml b/examples/demos/tweetsearch/content/SearchDelegate.qml
index 082653657..58a7aea08 100644
--- a/examples/demos/tweetsearch/content/SearchDelegate.qml
+++ b/examples/demos/tweetsearch/content/SearchDelegate.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 
 FlipBar {
     id: flipBar
diff --git a/examples/demos/tweetsearch/content/TweetDelegate.qml b/examples/demos/tweetsearch/content/TweetDelegate.qml
index 3b975f800..9d85e5d8a 100644
--- a/examples/demos/tweetsearch/content/TweetDelegate.qml
+++ b/examples/demos/tweetsearch/content/TweetDelegate.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "tweetsearch.mjs" as Helper
 
 Item {
diff --git a/examples/demos/tweetsearch/content/TweetsModel.qml b/examples/demos/tweetsearch/content/TweetsModel.qml
index d4edbf105..ab16ef9f5 100644
--- a/examples/demos/tweetsearch/content/TweetsModel.qml
+++ b/examples/demos/tweetsearch/content/TweetsModel.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "tweetsearch.mjs" as Helper
 
 Item {
diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/demos/tweetsearch/tweetsearch.qml
index d9508ad99..4d517f39c 100644
--- a/examples/demos/tweetsearch/tweetsearch.qml
+++ b/examples/demos/tweetsearch/tweetsearch.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+import QtQuick
 import "content"
 import "content/tweetsearch.mjs" as Helper