diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /examples/demos/twitterfriends/twitterfriends.qmlproject | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'examples/demos/twitterfriends/twitterfriends.qmlproject')
| -rw-r--r-- | examples/demos/twitterfriends/twitterfriends.qmlproject | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/examples/demos/twitterfriends/twitterfriends.qmlproject b/examples/demos/twitterfriends/twitterfriends.qmlproject new file mode 100644 index 0000000000..e841dee105 --- /dev/null +++ b/examples/demos/twitterfriends/twitterfriends.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "friends.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +}
\ No newline at end of file |