Skip to content

Commit

Permalink
Examples: Hard-code the 'main' file in .qmlproject
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kai Koehne authored and Qt by Nokia committed Jan 3, 2012
1 parent 742e979 commit 6da4dd4
Show file tree
Hide file tree
Showing 65 changed files with 209 additions and 65 deletions.
@@ -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: "."
Expand Down
5 changes: 4 additions & 1 deletion 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: "."
Expand Down
4 changes: 3 additions & 1 deletion 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: "."
Expand Down
@@ -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: "."
Expand All @@ -13,6 +15,10 @@ Project {
ImageFiles {
directory: "."
}
Files {
paths: ["TODO"]
}

/* List of plugin directories passed to QML runtime */
// importPaths: [ "../exampleplugin" ]
}
9 changes: 8 additions & 1 deletion 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: "."
Expand All @@ -11,6 +13,11 @@ Project {
ImageFiles {
directory: "."
}
Files {
filter: "*.ts"
directory: "i18n"
}

/* List of plugin directories passed to QML runtime */
// importPaths: [ " ../exampleplugin " ]
}
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
9 changes: 8 additions & 1 deletion 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: "."
Expand All @@ -11,6 +13,11 @@ Project {
ImageFiles {
directory: "."
}
Files {
filter: "*.ts"
directory: "i18n"
}

/* List of plugin directories passed to QML runtime */
// importPaths: [ " ../exampleplugin " ]
}
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
Expand Up @@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -1,4 +1,4 @@
import QmlProject 1.0
import QmlProject 1.1

Project {
/* Include .qml, .js, and image files from current directory and subdirectories */
Expand Down
4 changes: 3 additions & 1 deletion 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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down
@@ -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: "."
Expand Down

0 comments on commit 6da4dd4

Please sign in to comment.