diff options
| author | ruki <[email protected]> | 2019-09-08 22:48:59 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-09-08 22:48:59 +0800 |
| commit | a930cd8e170ec0192d8e9a2fc21ea956a24f53f8 (patch) | |
| tree | b6beea6c8d4ee504a6b7a4c1ca490be7dd91e0b8 /tests | |
| parent | 533b7ae2ee168d2be5f3df249712da0d9b141e40 (diff) | |
add qt.quickapp_static and qt.widgetapp_static
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/projects/qt/quickapp_static/xmake.lua | 9 | ||||
| -rw-r--r-- | tests/projects/qt/widgetapp_static/xmake.lua | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/projects/qt/quickapp_static/xmake.lua b/tests/projects/qt/quickapp_static/xmake.lua index d670aa92d..563851141 100644 --- a/tests/projects/qt/quickapp_static/xmake.lua +++ b/tests/projects/qt/quickapp_static/xmake.lua @@ -9,7 +9,7 @@ includes("qt_add_static_plugins.lua") target("qt_demo") -- add rules - add_rules("qt.quickapp") + add_rules("qt.quickapp_static") -- add headers add_headerfiles("src/*.h") @@ -18,13 +18,6 @@ target("qt_demo") add_files("src/*.cpp") add_files("src/qml.qrc") - -- 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", "qwindows"}}) - end - -- 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"}) diff --git a/tests/projects/qt/widgetapp_static/xmake.lua b/tests/projects/qt/widgetapp_static/xmake.lua index d435cc8b6..12fdd0715 100644 --- a/tests/projects/qt/widgetapp_static/xmake.lua +++ b/tests/projects/qt/widgetapp_static/xmake.lua @@ -9,7 +9,7 @@ includes("qt_add_static_plugins.lua") target("qt_demo") -- add rules - add_rules("qt.widgetapp") + add_rules("qt.widgetapp_static") -- add headers add_headerfiles("src/*.h") @@ -21,12 +21,5 @@ target("qt_demo") -- add files with Q_OBJECT meta (only for qt.moc) add_files("src/mainwindow.h") - -- add plugin: QXXXIntegrationPlugin - if is_plat("macosx") then - qt_add_static_plugins("QCocoaIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"qcocoa", "Qt5PrintSupport", "Qt5PlatformSupport", "cups"}}) - elseif is_plat("windows") then - qt_add_static_plugins("QWindowsIntegrationPlugin", {linkdirs = "plugins/platforms", links = {"Qt5PrintSupport", "Qt5PlatformSupport", "qwindows"}}) - end - -- add plugin: QSvgPlugin (optional) qt_add_static_plugins("QSvgPlugin", {linkdirs = "plugins/imageformats", links = {"qsvg", "Qt5Svg"}}) |