diff options
65 files changed, 209 insertions, 65 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugins.qmlproject b/examples/declarative/cppextensions/plugins/plugins.qmlproject index d4909f8685..c051b4ae76 100644 --- 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 d4909f8685..08e6b30f00 100644 --- 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 d4909f8685..49fddded69 100644 --- 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 53f5ecb8d2..abb13c2509 100644 --- 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 d4909f8685..62af71a953 100644 --- 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 d4909f8685..f93e66c5d2 100644 --- 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 d4909f8685..cefb00e15b 100644 --- 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 d4909f8685..b3525b40d6 100644 --- 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 d4909f8685..8d0daa8b95 100644 --- 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 d4909f8685..073c73bf95 100644 --- 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 d4909f8685..6f58c9daa8 100644 --- 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 d4909f8685..5377153baa 100644 --- 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 d4909f8685..b2a1e3a23b 100644 --- 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 d4909f8685..426f4d93ce 100644 --- 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 d4909f8685..13d17c7365 100644 --- 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 d4909f8685..e226ff1d9a 100644 --- 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 e5262175c5..6ec3a3d79b 100644 --- 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 e5262175c5..7facd6495d 100644 --- 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 e5262175c5..8bf2a5802d 100644 --- 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 d4909f8685..2ad87d88fa 100644 --- 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 d4909f8685..e572423761 100644 --- 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 d4909f8685..d4795f6c18 100644 --- 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 fe2dc299a0..a87b9b1cfb 100644 --- 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 d4909f8685..334ab5a538 100644 --- 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 d4909f8685..728404f179 100644 --- 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 d4909f8685..10a0cd6ece 100644 --- 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 e5262175c5..0d4b987aaa 100644 --- 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 d4909f8685..a7cf377523 100644 --- 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 d4909f8685..c8a00f72e3 100644 --- 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 d4909f8685..82b0cd10b0 100644 --- 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 d4909f8685..3bf9d5b808 100644 --- 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 d4909f8685..b64f6334ca 100644 --- 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 d4909f8685..7e3296acd2 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..84c64fc12d 100644 --- 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 d4909f8685..7587e957ca 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..09ec4aafb6 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..e1d43b74ef 100644 --- 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 d4909f8685..c4fa87e6bc 100644 --- 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 e5262175c5..6ec3a3d79b 100644 --- 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 e5262175c5..7facd6495d 100644 --- 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 e5262175c5..8bf2a5802d 100644 --- 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 d4909f8685..6b12778f3e 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..d8fb3da79c 100644 --- 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 fe2dc299a0..a87b9b1cfb 100644 --- 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 d4909f8685..334ab5a538 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..2a3d9281bb 100644 --- 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 d4909f8685..349b9731fe 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 d4909f8685..c4a510ce0f 100644 --- 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 ed034dff3f..8d9517eba9 100644 --- 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: "." |