diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
commit | 9bcea0318cae2f7fbfd24195ff9272cb369cb6e5 (patch) | |
tree | b5b6b2f79c29bc9a339dcc7a918524ee7ab66016 /examples/declarative/toys/tvtennis/tvtennis.qmlproject | |
parent | 124b71128feb596b136a545eb128c3b0e7093bf7 (diff) | |
parent | 1cf2984ea74f837d4e8ae476dac2622f0a049eab (diff) |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
Diffstat (limited to 'examples/declarative/toys/tvtennis/tvtennis.qmlproject')
-rw-r--r-- | examples/declarative/toys/tvtennis/tvtennis.qmlproject | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qmlproject b/examples/declarative/toys/tvtennis/tvtennis.qmlproject deleted file mode 100644 index d4909f8685..0000000000 --- a/examples/declarative/toys/tvtennis/tvtennis.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - // importPaths: [ " ../exampleplugin " ] -} |