support static quickapp for qt

3 files changed, 2 insertions, 9 deletions

diff --git a/tests/projects/qt/quickapp_static/src/main.cpp b/tests/projects/qt/quickapp_static/src/main.cpp
index e72853f44..6333b85c4 100644
--- a/tests/projects/qt/quickapp_static/src/main.cpp
+++ b/tests/projects/qt/quickapp_static/src/main.cpp
@@ -1,7 +1,5 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QQmlExtensionPlugin>
-#include <QtPlugin>
 
 int main(int argc, char *argv[])
 {
@@ -10,12 +8,6 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-
-    Q_IMPORT_PLUGIN(QtQuick2Plugin) 
-
-    qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_QtQuick2Plugin().instance())->registerTypes("QtQuick");
-    qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_QtQuick2Plugin().instance()) ->initializeEngine( &engine, "QtQuick");
-
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;
diff --git a/tests/projects/qt/quickapp_static/src/main.qml b/tests/projects/qt/quickapp_static/src/main.qml
index 188049dae..45ee20a2f 100644
--- a/tests/projects/qt/quickapp_static/src/main.qml
+++ b/tests/projects/qt/quickapp_static/src/main.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick 2.6
 import QtQuick.Window 2.2
 
 Window {
diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua
index 55662632e..de9f968a5 100644
--- a/tests/projects/qt/quickapp_static/xmake.lua
+++ b/tests/projects/qt/quickapp_static/xmake.lua
@@ -30,4 +30,5 @@ target("qt_demo")
 
     -- add plugin: qml.QtQuick
     qt_add_static_plugins("QtQuick2Plugin", {linkdirs = "qml/QtQuick.2", links = "qtquick2plugin"})
+    qt_add_static_plugins("QtQuick2WindowPlugin", {linkdirs = "qml/QtQuick/Window.2", links = "windowplugin"})