Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 23 insertions, 0 deletions

diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/app/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/app/main.qml
new file mode 100644
index 0000000000..b257de0b83
--- /dev/null
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/qml/app/main.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+
+ApplicationWindow {
+    title: qsTr("Hello World")
+    width: 640
+    height: 480
+
+    menuBar: MenuBar {
+        Menu {
+            title: qsTr("File")
+            MenuItem {
+                text: qsTr("Exit")
+                onTriggered: Qt.quit();
+            }
+        }
+    }
+
+    Button {
+        text: qsTr("Hello World")
+        anchors.centerIn: parent
+    }
+}