improve qt quickapp templates

6 files changed, 44 insertions, 3 deletions

diff --git a/tests/projects/qt/quickapp/src/main.qml b/tests/projects/qt/quickapp/src/main.qml
index 188049dae..120cdbddd 100644
--- a/tests/projects/qt/quickapp/src/main.qml
+++ b/tests/projects/qt/quickapp/src/main.qml
@@ -1,9 +1,18 @@
-import QtQuick 2.9
+import QtQuick 2.6
 import QtQuick.Window 2.2
+import QtQuick.Controls 2.2
 
 Window {
+    id: root
     visible: true
     width: 640
     height: 480
     title: qsTr("Hello World")
+    Button {
+        text: "Ok"
+        onClicked: {
+            root.color = Qt.rgba(Math.random(), Math.random(), Math.random(), 1);
+        }
+    }
 }
+
diff --git a/tests/projects/qt/quickapp_static/src/main.qml b/tests/projects/qt/quickapp_static/src/main.qml
index 45ee20a2f..6fac8853d 100644
--- a/tests/projects/qt/quickapp_static/src/main.qml
+++ b/tests/projects/qt/quickapp_static/src/main.qml
@@ -1,9 +1,17 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
+import QtQuick.Controls 2.2
 
 Window {
+    id: root
     visible: true
     width: 640
     height: 480
     title: qsTr("Hello World")
+    Button {
+        text: "Ok"
+        onClicked: {
+            root.color = Qt.rgba(Math.random(), Math.random(), Math.random(), 1);
+        }
+    }
 }
diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua
index 075a8d46c..196749658 100644
--- a/tests/projects/qt/quickapp_static/xmake.lua
+++ b/tests/projects/qt/quickapp_static/xmake.lua
@@ -2,11 +2,14 @@ add_rules("mode.debug", "mode.release")
 
 includes("qt_add_static_plugins.lua")
 
-target("qt_demo")
+target("demo")
     add_rules("qt.quickapp_static")
     add_headerfiles("src/*.h")
     add_files("src/*.cpp")
     add_files("src/qml.qrc")
+    add_frameworks("QtQuickControls2", "QtQuickTemplates2")
     qt_add_static_plugins("QtQuick2Plugin", {linkdirs = "qml/QtQuick.2", links = "qtquick2plugin"})
     qt_add_static_plugins("QtQuick2WindowPlugin", {linkdirs = "qml/QtQuick/Window.2", links = "windowplugin"})
+    qt_add_static_plugins("QtQuickControls2Plugin", {linkdirs = "qml/QtQuick/Controls.2", links = "qtquickcontrols2plugin"})
+    qt_add_static_plugins("QtQuickTemplates2Plugin", {linkdirs = "qml/QtQuick/Templates.2", links = "qtquicktemplates2plugin"})
 
diff --git a/xmake/templates/c++/qt.quickapp/project/src/main.qml b/xmake/templates/c++/qt.quickapp/project/src/main.qml
index 188049dae..120cdbddd 100644
--- a/xmake/templates/c++/qt.quickapp/project/src/main.qml
+++ b/xmake/templates/c++/qt.quickapp/project/src/main.qml
@@ -1,9 +1,18 @@
-import QtQuick 2.9
+import QtQuick 2.6
 import QtQuick.Window 2.2
+import QtQuick.Controls 2.2
 
 Window {
+    id: root
     visible: true
     width: 640
     height: 480
     title: qsTr("Hello World")
+    Button {
+        text: "Ok"
+        onClicked: {
+            root.color = Qt.rgba(Math.random(), Math.random(), Math.random(), 1);
+        }
+    }
 }
+
diff --git a/xmake/templates/c++/qt.quickapp_static/project/src/main.qml b/xmake/templates/c++/qt.quickapp_static/project/src/main.qml
index 45ee20a2f..120cdbddd 100644
--- a/xmake/templates/c++/qt.quickapp_static/project/src/main.qml
+++ b/xmake/templates/c++/qt.quickapp_static/project/src/main.qml
@@ -1,9 +1,18 @@
 import QtQuick 2.6
 import QtQuick.Window 2.2
+import QtQuick.Controls 2.2
 
 Window {
+    id: root
     visible: true
     width: 640
     height: 480
     title: qsTr("Hello World")
+    Button {
+        text: "Ok"
+        onClicked: {
+            root.color = Qt.rgba(Math.random(), Math.random(), Math.random(), 1);
+        }
+    }
 }
+
diff --git a/xmake/templates/c++/qt.quickapp_static/project/xmake.lua b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua
index 6e9e2db5a..860dc513c 100644
--- a/xmake/templates/c++/qt.quickapp_static/project/xmake.lua
+++ b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua
@@ -7,7 +7,10 @@ target("${TARGETNAME}")
     add_headerfiles("src/*.h")
     add_files("src/*.cpp")
     add_files("src/qml.qrc")
+    add_frameworks("QtQuickControls2", "QtQuickTemplates2")
     qt_add_static_plugins("QtQuick2Plugin", {linkdirs = "qml/QtQuick.2", links = "qtquick2plugin"})
     qt_add_static_plugins("QtQuick2WindowPlugin", {linkdirs = "qml/QtQuick/Window.2", links = "windowplugin"})
+    qt_add_static_plugins("QtQuickControls2Plugin", {linkdirs = "qml/QtQuick/Controls.2", links = "qtquickcontrols2plugin"})
+    qt_add_static_plugins("QtQuickTemplates2Plugin", {linkdirs = "qml/QtQuick/Templates.2", links = "qtquicktemplates2plugin"})
 
 ${FAQ}