Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	qmake/generators/makefile.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	qmake/generators/win32/msvc_vcxproj.cpp
	src/corelib/global/qnamespace.h
	src/gui/text/qtextcontrol.cpp

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 " ]
+}