summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-14 02:38:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-14 02:38:44 (GMT)
commit2980c4534b231c38584f88699d356ea26bb5266b (patch)
tree43c6ce757fa00f80c16355ee7c0d52a0ede11cf7 /examples
parent5d2d21377bfb99ddb69a27a05b7baab93d411f35 (diff)
parentf6505f9f2eb4c594d3a249655879117e2a136468 (diff)
downloadQt-2980c4534b231c38584f88699d356ea26bb5266b.zip
Qt-2980c4534b231c38584f88699d356ea26bb5266b.tar.gz
Qt-2980c4534b231c38584f88699d356ea26bb5266b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add pincharea.qmlproject file for PinchArea example. Moving contentY by large values in List/GridView is slow
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/touchinteraction/pincharea/pincharea.qmlproject18
1 files changed, 18 insertions, 0 deletions
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.qmlproject b/examples/declarative/touchinteraction/pincharea/pincharea.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/touchinteraction/pincharea/pincharea.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+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 " ]
+}