From dd8709e5546211976a97aa561d6c97cea4d233bb Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Tue, 16 Jun 2020 10:50:31 +0200 Subject: [PATCH] AssetExporter: Add plugin to cmake and qbs build system Change-Id: I2b48a854ed4e5e94cab73883f8b0f41d0ed15697 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 19 +++++++ .../assetexporterplugin.qbs | 51 +++++++++++++++++++ src/plugins/qmldesigner/qmldesigner.qbs | 1 + 3 files changed, 71 insertions(+) create mode 100644 src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 345c756034b..e3d52ba8639 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -38,6 +38,25 @@ if (APPLE) set(QmlDesignerPluginInstallPrefix "${IDE_PLUGIN_PATH}/QmlDesigner") endif() + +add_qtc_plugin(assetexporterplugin + CONDITION TARGET QmlDesigner + DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml + PUBLIC_INCLUDES assetexporterplugin + SOURCES + assetexporterplugin/assetexportdialog.h assetexporterplugin/assetexportdialog.cpp assetexporterplugin/assetexportdialog.ui + assetexporterplugin/assetexporter.h assetexporterplugin/assetexporter.cpp + assetexporterplugin/assetexporterplugin.h assetexporterplugin/assetexporterplugin.cpp + assetexporterplugin/assetexporterview.h assetexporterplugin/assetexporterview.cpp + assetexporterplugin/assetexportpluginconstants.h + assetexporterplugin/componentexporter.h assetexporterplugin/componentexporter.cpp + assetexporterplugin/parsers/modelitemnodeparser.h assetexporterplugin/parsers/modelitemnodeparser.cpp + assetexporterplugin/parsers/modelnodeparser.h assetexporterplugin/parsers/modelnodeparser.cpp + assetexporterplugin/assetexporterplugin.qrc + PLUGIN_PATH ${QmlDesignerPluginInstallPrefix} + SKIP_DEBUG_CMAKE_FILE_CHECK +) + add_qtc_plugin(componentsplugin CONDITION TARGET QmlDesigner DEPENDS Core QmlDesigner Utils Qt5::Qml diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs new file mode 100644 index 00000000000..b6cd9ddfc37 --- /dev/null +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs @@ -0,0 +1,51 @@ +import qbs + +QtcProduct { + name: "assetexporterplugin" + type: ["dynamiclibrary"] + installDir: qtc.ide_plugin_path + '/' + installDirName + property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner" + + Depends { name: "Core" } + Depends { name: "ProjectExplorer" } + Depends { name: "QmlDesigner" } + Depends { name: "Utils" } + + cpp.includePaths: base.concat([ + "./", + "../designercore/include", + "../../../../share/qtcreator/qml/qmlpuppet/interfaces", + "../../../../share/qtcreator/qml/qmlpuppet/types" + ]) + + Properties { + condition: qbs.targetOS.contains("unix") + cpp.internalVersion: "" + } + + Group { + name: "plugin metadata" + files: ["assetexporterplugin.json"] + fileTags: ["qt_plugin_metadata"] + } + + files: [ + "assetexportdialog.cpp", + "assetexportdialog.h", + "assetexportdialog.ui", + "assetexporter.cpp", + "assetexporter.h", + "assetexporterplugin.cpp", + "assetexporterplugin.h", + "assetexporterplugin.qrc", + "assetexporterview.cpp", + "assetexporterview.h", + "assetexportpluginconstants.h", + "componentexporter.cpp", + "componentexporter.h", + "parsers/modelitemnodeparser.cpp", + "parsers/modelitemnodeparser.h", + "parsers/modelnodeparser.cpp", + "parsers/modelnodeparser.h" + ] +} diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs index e46eec6f912..b14db788660 100644 --- a/src/plugins/qmldesigner/qmldesigner.qbs +++ b/src/plugins/qmldesigner/qmldesigner.qbs @@ -6,5 +6,6 @@ Project { "qmldesignerplugin.qbs", "qtquickplugin/qtquickplugin.qbs", "componentsplugin/componentsplugin.qbs", + "assetexporterplugin/assetexporterplugin.qbs" ] }