diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-22 21:34:44 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-22 21:34:44 (GMT) |
commit | 526eda58dae96dca2c5aebcb48b007f09bd7ecac (patch) | |
tree | 2262444830c9b20cf88c568f98b916aef1acb1ff /examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject | |
parent | 5f2090f0f2280c32d06fbc5188ccb799d7b1a489 (diff) | |
parent | 0f4a61a33942744b1609c2b375d28765a215e39f (diff) | |
download | Qt-526eda58dae96dca2c5aebcb48b007f09bd7ecac.zip Qt-526eda58dae96dca2c5aebcb48b007f09bd7ecac.tar.gz Qt-526eda58dae96dca2c5aebcb48b007f09bd7ecac.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits)
Add note to declarative calculator example
Help: Add \depends to all declarative examples & demos
Declarative Examples: Fall back to local qmlapplicationviewer.
Fix qdoc output for <dependency> tag.
Change installation location of examples.
Add Symbian platform notes.
Fix "make install" for declarative examples
Add C++11 support and QThreadLocalStorage changes to docs.
Update the license in the qmlapplicationviewer.
Examples: Add Copright headers, Remove stray file.
Compile fix.
Fix use of qmlapplicationviewer.
Doc: Create relative pathes in Manifest files.
Doc: Copy manifest files to the places where Creator expects them.
qdoc3: qdoc supports \depends in 4.8
qdoc3: qdoc supports \depends in 4.8
Update qrc files.
Update qmlapplicationviewer template,
cppextensions/qgraphicslayout example corrections
demos/declarative/snake example corrections
...
Diffstat (limited to 'examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject')
-rw-r--r-- | examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject b/examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject new file mode 100644 index 0000000..3294cb2 --- /dev/null +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/gestures.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "qml/experimental-gestures" + } + JavaScriptFiles { + directory: "qml/experimental-gestures" + } + ImageFiles { + directory: "qml/experimental-gestures" + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} |