Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50

Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33

1 files changed, 41 insertions, 0 deletions

diff --git a/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject
new file mode 100644
index 0000000000..22969ff4d8
--- /dev/null
+++ b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject
@@ -0,0 +1,41 @@
+/* File generated by Qt Creator */
+
+import QmlProject 1.1
+
+Project {
+    mainFile: "MainFile.ui.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+
+    JavaScriptFiles {
+        directory: "."
+    }
+
+    ImageFiles {
+        directory: "."
+    }
+
+    Files {
+        filter: "*.conf"
+        files: ["qtquickcontrols2.conf"]
+    }
+
+    Files {
+        filter: "qmldir"
+        directory: "."
+    }
+
+    Environment {
+        QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf"
+        QT_AUTO_SCREEN_SCALE_FACTOR: "1"
+    }
+
+    /* List of plugin directories passed to QML runtime */
+    importPaths: [ "imports" ]
+
+    /* Required for deployment */
+    targetDirectory: "/tmp/SideMenu"
+}