Examples: Hard-code the 'main' file in .qmlproject

Set the 'mainFile:' property in .qmlproject files where it makes sense (i.e.
there's one natural candidate). This makes sure Qt Creator doesn't fall back
to 'current file in editor' as main file, which is unexpected to a lot of people.

(This requires Qt Creator version 2.2 and newer).

Change-Id: Ia5d20b0d982038520d7892bca155267c5f13644b
Reviewed-by: Martin Jones <martin.jones@nokia.com>

diff --git a/examples/declarative/cppextensions/plugins/plugins.qmlproject b/examples/declarative/cppextensions/plugins/plugins.qmlproject
index d4909f8..c051b4a 100644 (file)
--- a/examples/declarative/cppextensions/plugins/plugins.qmlproject
+++ b/examples/declarative/cppextensions/plugins/plugins.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "plugins.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/flickr/flickr.qmlproject b/examples/declarative/flickr/flickr.qmlproject
index d4909f8..08e6b30 100644 (file)
--- a/examples/declarative/flickr/flickr.qmlproject
+++ b/examples/declarative/flickr/flickr.qmlproject
@@ -1,6 +1,9 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "flickr.qml"
+    //mainFile: "flickr-90.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/minehunt/minehunt.qmlproject b/examples/declarative/minehunt/minehunt.qmlproject
index d4909f8..49fddde 100644 (file)
--- a/examples/declarative/minehunt/minehunt.qmlproject
+++ b/examples/declarative/minehunt/minehunt.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "minehunt.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject b/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
index 53f5ecb..abb13c2 100644 (file)
--- a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
+++ b/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "plasmapatrol.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
@@ -13,6 +15,10 @@ Project {
     ImageFiles {
         directory: "."
     }
+    Files {
+        paths: ["TODO"]
+    }
+
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ "../exampleplugin" ]
 }

diff --git a/examples/declarative/photoviewer/photoviewer.qmlproject b/examples/declarative/photoviewer/photoviewer.qmlproject
index d4909f8..62af71a 100644 (file)
--- a/examples/declarative/photoviewer/photoviewer.qmlproject
+++ b/examples/declarative/photoviewer/photoviewer.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "photoviewer.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
@@ -11,6 +13,11 @@ Project {
     ImageFiles {
         directory: "."
     }
+    Files {
+        filter: "*.ts"
+        directory: "i18n"
+    }
+
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
 }

diff --git a/examples/declarative/qtquick1/animation/easing/easing.qmlproject b/examples/declarative/qtquick1/animation/easing/easing.qmlproject
index d4909f8..f93e66c 100644 (file)
--- a/examples/declarative/qtquick1/animation/easing/easing.qmlproject
+++ b/examples/declarative/qtquick1/animation/easing/easing.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "easing.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/animation/states/states.qmlproject b/examples/declarative/qtquick1/animation/states/states.qmlproject
index d4909f8..cefb00e 100644 (file)
--- a/examples/declarative/qtquick1/animation/states/states.qmlproject
+++ b/examples/declarative/qtquick1/animation/states/states.qmlproject
@@ -1,6 +1,9 @@
 import QmlProject 1.0
 
 Project {
+    mainFile: "states.qml"
+    //mainFile: "transitions.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/i18n/i18n.qmlproject b/examples/declarative/qtquick1/i18n/i18n.qmlproject
index d4909f8..b3525b4 100644 (file)
--- a/examples/declarative/qtquick1/i18n/i18n.qmlproject
+++ b/examples/declarative/qtquick1/i18n/i18n.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "i18n.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
@@ -11,6 +13,11 @@ Project {
     ImageFiles {
         directory: "."
     }
+    Files {
+        filter: "*.ts"
+        directory: "i18n"
+    }
+
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
 }

diff --git a/examples/declarative/qtquick1/imageelements/image/image.qmlproject b/examples/declarative/qtquick1/imageelements/image/image.qmlproject
index d4909f8..8d0daa8 100644 (file)
--- a/examples/declarative/qtquick1/imageelements/image/image.qmlproject
+++ b/examples/declarative/qtquick1/imageelements/image/image.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "image.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/keyinteraction/focus/focus.qmlproject b/examples/declarative/qtquick1/keyinteraction/focus/focus.qmlproject
index d4909f8..073c73b 100644 (file)
--- a/examples/declarative/qtquick1/keyinteraction/focus/focus.qmlproject
+++ b/examples/declarative/qtquick1/keyinteraction/focus/focus.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "focus.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/keyinteraction/keyinteraction.qmlproject b/examples/declarative/qtquick1/keyinteraction/keyinteraction.qmlproject
index d4909f8..6f58c9d 100644 (file)
--- a/examples/declarative/qtquick1/keyinteraction/keyinteraction.qmlproject
+++ b/examples/declarative/qtquick1/keyinteraction/keyinteraction.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "focus/focus.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/modelviews/gridview/gridview.qmlproject b/examples/declarative/qtquick1/modelviews/gridview/gridview.qmlproject
index d4909f8..5377153 100644 (file)
--- a/examples/declarative/qtquick1/modelviews/gridview/gridview.qmlproject
+++ b/examples/declarative/qtquick1/modelviews/gridview/gridview.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "gridview-example.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/modelviews/package/package.qmlproject b/examples/declarative/qtquick1/modelviews/package/package.qmlproject
index d4909f8..b2a1e3a 100644 (file)
--- a/examples/declarative/qtquick1/modelviews/package/package.qmlproject
+++ b/examples/declarative/qtquick1/modelviews/package/package.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "view.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/modelviews/parallax/parallax.qmlproject b/examples/declarative/qtquick1/modelviews/parallax/parallax.qmlproject
index d4909f8..426f4d9 100644 (file)
--- a/examples/declarative/qtquick1/modelviews/parallax/parallax.qmlproject
+++ b/examples/declarative/qtquick1/modelviews/parallax/parallax.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "parallax.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/modelviews/pathview/pathview.qmlproject b/examples/declarative/qtquick1/modelviews/pathview/pathview.qmlproject
index d4909f8..13d17c7 100644 (file)
--- a/examples/declarative/qtquick1/modelviews/pathview/pathview.qmlproject
+++ b/examples/declarative/qtquick1/modelviews/pathview/pathview.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "pathview-example.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qmlproject b/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qmlproject
index d4909f8..e226ff1 100644 (file)
--- a/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qmlproject
+++ b/examples/declarative/qtquick1/modelviews/visualitemmodel/visualitemmodel.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "visualitemmodel.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/righttoleft/layoutdirection/layoutdirection.qmlproject b/examples/declarative/qtquick1/righttoleft/layoutdirection/layoutdirection.qmlproject
index e526217..6ec3a3d 100644 (file)
--- a/examples/declarative/qtquick1/righttoleft/layoutdirection/layoutdirection.qmlproject
+++ b/examples/declarative/qtquick1/righttoleft/layoutdirection/layoutdirection.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "layoutdirection.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/righttoleft/layoutmirroring/layoutmirroring.qmlproject b/examples/declarative/qtquick1/righttoleft/layoutmirroring/layoutmirroring.qmlproject
index e526217..7facd64 100644 (file)
--- a/examples/declarative/qtquick1/righttoleft/layoutmirroring/layoutmirroring.qmlproject
+++ b/examples/declarative/qtquick1/righttoleft/layoutmirroring/layoutmirroring.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "layoutmirroring.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/righttoleft/textalignment/textalignment.qmlproject b/examples/declarative/qtquick1/righttoleft/textalignment/textalignment.qmlproject
index e526217..8bf2a58 100644 (file)
--- a/examples/declarative/qtquick1/righttoleft/textalignment/textalignment.qmlproject
+++ b/examples/declarative/qtquick1/righttoleft/textalignment/textalignment.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "textalignment.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/screenorientation/screenorientation.qmlproject b/examples/declarative/qtquick1/screenorientation/screenorientation.qmlproject
index d4909f8..2ad87d8 100644 (file)
--- a/examples/declarative/qtquick1/screenorientation/screenorientation.qmlproject
+++ b/examples/declarative/qtquick1/screenorientation/screenorientation.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "screenorientation.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/sqllocalstorage/sqllocalstorage.qmlproject b/examples/declarative/qtquick1/sqllocalstorage/sqllocalstorage.qmlproject
index d4909f8..e572423 100644 (file)
--- a/examples/declarative/qtquick1/sqllocalstorage/sqllocalstorage.qmlproject
+++ b/examples/declarative/qtquick1/sqllocalstorage/sqllocalstorage.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "hello.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/text/textselection/textselection.qmlproject b/examples/declarative/qtquick1/text/textselection/textselection.qmlproject
index d4909f8..d4795f6 100644 (file)
--- a/examples/declarative/qtquick1/text/textselection/textselection.qmlproject
+++ b/examples/declarative/qtquick1/text/textselection/textselection.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "textselection.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/threading/threadedlistmodel/threadedlistmodel.qmlproject b/examples/declarative/qtquick1/threading/threadedlistmodel/threadedlistmodel.qmlproject
index fe2dc29..a87b9b1 100644 (file)
--- a/examples/declarative/qtquick1/threading/threadedlistmodel/threadedlistmodel.qmlproject
+++ b/examples/declarative/qtquick1/threading/threadedlistmodel/threadedlistmodel.qmlproject
@@ -38,9 +38,11 @@
 **
 ****************************************************************************/
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "timedisplay.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/threading/workerscript/workerscript.qmlproject b/examples/declarative/qtquick1/threading/workerscript/workerscript.qmlproject
index d4909f8..334ab5a 100644 (file)
--- a/examples/declarative/qtquick1/threading/workerscript/workerscript.qmlproject
+++ b/examples/declarative/qtquick1/threading/workerscript/workerscript.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "workerscript.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/touchinteraction/gestures/gestures.qmlproject b/examples/declarative/qtquick1/touchinteraction/gestures/gestures.qmlproject
index d4909f8..728404f 100644 (file)
--- a/examples/declarative/qtquick1/touchinteraction/gestures/gestures.qmlproject
+++ b/examples/declarative/qtquick1/touchinteraction/gestures/gestures.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "experimental-gestures.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/touchinteraction/mousearea/mousearea.qmlproject b/examples/declarative/qtquick1/touchinteraction/mousearea/mousearea.qmlproject
index d4909f8..10a0cd6 100644 (file)
--- a/examples/declarative/qtquick1/touchinteraction/mousearea/mousearea.qmlproject
+++ b/examples/declarative/qtquick1/touchinteraction/mousearea/mousearea.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "mousearea-example.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/touchinteraction/pincharea/pincharea.qmlproject b/examples/declarative/qtquick1/touchinteraction/pincharea/pincharea.qmlproject
index e526217..0d4b987 100644 (file)
--- a/examples/declarative/qtquick1/touchinteraction/pincharea/pincharea.qmlproject
+++ b/examples/declarative/qtquick1/touchinteraction/pincharea/pincharea.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "flickresize.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/touchinteraction/touchinteraction.qmlproject b/examples/declarative/qtquick1/touchinteraction/touchinteraction.qmlproject
index d4909f8..a7cf377 100644 (file)
--- a/examples/declarative/qtquick1/touchinteraction/touchinteraction.qmlproject
+++ b/examples/declarative/qtquick1/touchinteraction/touchinteraction.qmlproject
@@ -1,4 +1,4 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */

diff --git a/examples/declarative/qtquick1/toys/clocks/clocks.qmlproject b/examples/declarative/qtquick1/toys/clocks/clocks.qmlproject
index d4909f8..c8a00f7 100644 (file)
--- a/examples/declarative/qtquick1/toys/clocks/clocks.qmlproject
+++ b/examples/declarative/qtquick1/toys/clocks/clocks.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "clocks.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/toys/corkboards/corkboards.qmlproject b/examples/declarative/qtquick1/toys/corkboards/corkboards.qmlproject
index d4909f8..82b0cd1 100644 (file)
--- a/examples/declarative/qtquick1/toys/corkboards/corkboards.qmlproject
+++ b/examples/declarative/qtquick1/toys/corkboards/corkboards.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "corkboards.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/toys/dynamicscene/dynamicscene.qmlproject b/examples/declarative/qtquick1/toys/dynamicscene/dynamicscene.qmlproject
index d4909f8..3bf9d5b 100644 (file)
--- a/examples/declarative/qtquick1/toys/dynamicscene/dynamicscene.qmlproject
+++ b/examples/declarative/qtquick1/toys/dynamicscene/dynamicscene.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "dynamicscene.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/toys/tic-tac-toe/tic-tac-toe.qmlproject b/examples/declarative/qtquick1/toys/tic-tac-toe/tic-tac-toe.qmlproject
index d4909f8..b64f633 100644 (file)
--- a/examples/declarative/qtquick1/toys/tic-tac-toe/tic-tac-toe.qmlproject
+++ b/examples/declarative/qtquick1/toys/tic-tac-toe/tic-tac-toe.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "tic-tac-toe.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/toys/tvtennis/tvtennis.qmlproject b/examples/declarative/qtquick1/toys/tvtennis/tvtennis.qmlproject
index d4909f8..7e3296a 100644 (file)
--- a/examples/declarative/qtquick1/toys/tvtennis/tvtennis.qmlproject
+++ b/examples/declarative/qtquick1/toys/tvtennis/tvtennis.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "tvtennis.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/declarative/qtquick1/tutorials/samegame/samegame1/samegame1.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/qtquick1/tutorials/samegame/samegame1/samegame1.qmlproject
+++ b/examples/declarative/qtquick1/tutorials/samegame/samegame1/samegame1.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/declarative/qtquick1/tutorials/samegame/samegame2/samegame2.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/qtquick1/tutorials/samegame/samegame2/samegame2.qmlproject
+++ b/examples/declarative/qtquick1/tutorials/samegame/samegame2/samegame2.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/declarative/qtquick1/tutorials/samegame/samegame3/samegame3.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/qtquick1/tutorials/samegame/samegame3/samegame3.qmlproject
+++ b/examples/declarative/qtquick1/tutorials/samegame/samegame3/samegame3.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/declarative/qtquick1/tutorials/samegame/samegame4/samegame4.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/qtquick1/tutorials/samegame/samegame4/samegame4.qmlproject
+++ b/examples/declarative/qtquick1/tutorials/samegame/samegame4/samegame4.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/dialcontrol/dialcontrol.qmlproject b/examples/declarative/qtquick1/ui-components/dialcontrol/dialcontrol.qmlproject
index d4909f8..84c64fc 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/dialcontrol/dialcontrol.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/dialcontrol/dialcontrol.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "dialcontrol.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/flipable/flipable.qmlproject b/examples/declarative/qtquick1/ui-components/flipable/flipable.qmlproject
index d4909f8..7587e95 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/flipable/flipable.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/flipable/flipable.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "flipable.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/progressbar/progressbar.qmlproject b/examples/declarative/qtquick1/ui-components/progressbar/progressbar.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/progressbar/progressbar.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/progressbar/progressbar.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/scrollbar/scrollbar.qmlproject b/examples/declarative/qtquick1/ui-components/scrollbar/scrollbar.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/scrollbar/scrollbar.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/scrollbar/scrollbar.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/searchbox/searchbox.qmlproject b/examples/declarative/qtquick1/ui-components/searchbox/searchbox.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/searchbox/searchbox.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/searchbox/searchbox.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/slideswitch/slideswitch.qmlproject b/examples/declarative/qtquick1/ui-components/slideswitch/slideswitch.qmlproject
index d4909f8..09ec4aa 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/slideswitch/slideswitch.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/slideswitch/slideswitch.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "slideswitch.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/spinner/spinner.qmlproject b/examples/declarative/qtquick1/ui-components/spinner/spinner.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/spinner/spinner.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/spinner/spinner.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/ui-components/tabwidget/tabwidget.qmlproject b/examples/declarative/qtquick1/ui-components/tabwidget/tabwidget.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/qtquick1/ui-components/tabwidget/tabwidget.qmlproject
+++ b/examples/declarative/qtquick1/ui-components/tabwidget/tabwidget.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/xml/xml.qmlproject b/examples/declarative/qtquick1/xml/xml.qmlproject
index d4909f8..e1d43b7 100644 (file)
--- a/examples/declarative/qtquick1/xml/xml.qmlproject
+++ b/examples/declarative/qtquick1/xml/xml.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "xmlhttprequest/xmlhttprequest-example.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/qtquick1/xml/xmlhttprequest/xmlhttprequest.qmlproject b/examples/declarative/qtquick1/xml/xmlhttprequest/xmlhttprequest.qmlproject
index d4909f8..c4fa87e 100644 (file)
--- a/examples/declarative/qtquick1/xml/xmlhttprequest/xmlhttprequest.qmlproject
+++ b/examples/declarative/qtquick1/xml/xmlhttprequest/xmlhttprequest.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "xmlhttprequest-example.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
@@ -11,6 +13,10 @@ Project {
     ImageFiles {
         directory: "."
     }
+    Files {
+        paths: ["data.xml"]
+    }
+
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
 }

diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject
index e526217..6ec3a3d 100644 (file)
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject
+++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "layoutdirection.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject
index e526217..7facd64 100644 (file)
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject
+++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "layoutmirroring.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject b/examples/declarative/righttoleft/textalignment/textalignment.qmlproject
index e526217..8bf2a58 100644 (file)
--- a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject
+++ b/examples/declarative/righttoleft/textalignment/textalignment.qmlproject
@@ -1,8 +1,10 @@
 /* File generated by QtCreator */
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "textalignment.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/rssnews/rssnews.qmlproject b/examples/declarative/rssnews/rssnews.qmlproject
index d4909f8..6b12778 100644 (file)
--- a/examples/declarative/rssnews/rssnews.qmlproject
+++ b/examples/declarative/rssnews/rssnews.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "rssnews.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/samegame/samegame.qmlproject b/examples/declarative/samegame/samegame.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/samegame/samegame.qmlproject
+++ b/examples/declarative/samegame/samegame.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/snake/snake.qmlproject b/examples/declarative/snake/snake.qmlproject
index d4909f8..d8fb3da 100644 (file)
--- a/examples/declarative/snake/snake.qmlproject
+++ b/examples/declarative/snake/snake.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "snake.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
index fe2dc29..a87b9b1 100644 (file)
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
+++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
@@ -38,9 +38,11 @@
 **
 ****************************************************************************/
 
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "timedisplay.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/threading/workerscript/workerscript.qmlproject b/examples/declarative/threading/workerscript/workerscript.qmlproject
index d4909f8..334ab5a 100644 (file)
--- a/examples/declarative/threading/workerscript/workerscript.qmlproject
+++ b/examples/declarative/threading/workerscript/workerscript.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "workerscript.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject
index d4909f8..2a3d928 100644 (file)
--- a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "samegame.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/twitter/twitter.qmlproject b/examples/declarative/twitter/twitter.qmlproject
index d4909f8..349b973 100644 (file)
--- a/examples/declarative/twitter/twitter.qmlproject
+++ b/examples/declarative/twitter/twitter.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "twitter.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject b/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/ui-components/searchbox/searchbox.qmlproject b/examples/declarative/ui-components/searchbox/searchbox.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/ui-components/searchbox/searchbox.qmlproject
+++ b/examples/declarative/ui-components/searchbox/searchbox.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/ui-components/spinner/spinner.qmlproject b/examples/declarative/ui-components/spinner/spinner.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/ui-components/spinner/spinner.qmlproject
+++ b/examples/declarative/ui-components/spinner/spinner.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject b/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
index d4909f8..c4a510c 100644 (file)
--- a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
@@ -1,6 +1,8 @@
-import QmlProject 1.0
+import QmlProject 1.1
 
 Project {
+    mainFile: "main.qml"
+
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."

diff --git a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject b/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
index ed034df..8d9517e 100644 (file)
--- a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
+++ b/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
@@ -4,8 +4,6 @@ Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
-       directory: "core"
-       directory: "filedialog"
     }
     JavaScriptFiles {
         directory: "."