add qt_add_static_plugins

3 files changed, 39 insertions, 9 deletions

diff --git a/tests/projects/qt/quickapp_static/src/main.cpp b/tests/projects/qt/quickapp_static/src/main.cpp
index 05e41f5e1..e72853f44 100644
--- a/tests/projects/qt/quickapp_static/src/main.cpp
+++ b/tests/projects/qt/quickapp_static/src/main.cpp
@@ -12,7 +12,6 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
 
     Q_IMPORT_PLUGIN(QtQuick2Plugin) 
-//    Q_IMPORT_PLUGIN(QtQuick2WindowPlugin)
 
     qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_QtQuick2Plugin().instance())->registerTypes("QtQuick");
     qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_QtQuick2Plugin().instance()) ->initializeEngine( &engine, "QtQuick");
diff --git a/tests/projects/qt/quickapp_static/w b/tests/projects/qt/quickapp_static/w
new file mode 100644
index 000000000..49412dd35
--- /dev/null
+++ b/tests/projects/qt/quickapp_static/w
@@ -0,0 +1,32 @@
+
+-- add modes: debug and release 
+add_rules("mode.debug", "mode.release")
+
+-- add target
+target("qt_demo")
+
+    -- add rules
+    add_rules("qt.application")
+
+    -- add headers
+    add_headerfiles("src/*.h")
+
+    -- add files
+    add_files("src/*.cpp") 
+    add_files("src/qml.qrc")
+
+    -- add frameworks
+    add_frameworks("QtQuick")
+
+    -- add plugin: QXXXIntegrationPlugin
+    if is_plat("macosx") then
+        qt_add_static_plugins("QCocoaIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}})
+    elseif is_plat("windows") then
+        qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}})
+    end
+
+    -- add plugin: qml.QtQuick
+    add_values("qt.linkdirs", "qml/QtQuick.2")
+    add_values("qt.links", "qtquick2plugin")
+    add_values("qt.plugins", "QtQuick2Plugin")
+
diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua
index 03232c822..55662632e 100644
--- a/tests/projects/qt/quickapp_static/xmake.lua
+++ b/tests/projects/qt/quickapp_static/xmake.lua
@@ -2,6 +2,9 @@
 -- add modes: debug and release 
 add_rules("mode.debug", "mode.release")
 
+-- includes
+includes("qt_add_static_plugins.lua")
+
 -- add target
 target("qt_demo")
 
@@ -18,17 +21,13 @@ target("qt_demo")
     -- add frameworks
     add_frameworks("QtQuick")
 
-    -- add plugin: platforms
-    add_values("qt.linkdirs", "plugins/platforms")
+    -- add plugin: QXXXIntegrationPlugin
     if is_plat("macosx") then
-        add_values("qt.links", "qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups")
-        add_values("qt.plugins", "QCocoaIntegrationPlugin")
+        qt_add_static_plugins("QCocoaIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}})
     elseif is_plat("windows") then
-        add_values("qt.links", "Qt5PrintSupport", "Qt5PlatformSupport", "cups")
-        add_values("qt.plugins", "QWindowsIntegrationPlugin")
+        qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "Qt5Widgets", "cups"}})
     end
 
     -- add plugin: qml.QtQuick
-    add_values("qt.linkdirs", "qml/QtQuick.2")
-    add_values("qt.links", "qtquick2plugin")
+    qt_add_static_plugins("QtQuick2Plugin", {linkdirs = "qml/QtQuick.2", links = "qtquick2plugin"})