aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/assetexporterplugin
Commit message (Collapse)AuthorAgeFilesLines
* qmldesigner: use right include syntaxTim Jenssen2020-10-121-6/+6
| | | | | Change-Id: Iafd04ad287bac6b0c94359fa54893904de61aa96 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* QmlDesigner: Fix build with Qt6Eike Ziller2020-09-211-1/+1
| | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I3d5c7d821402acc13ccd505550afc66a531b13b5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-032-17/+39
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
| * AssetExport: Do not export states, timeline and connection nodesVikas Pachdha2020-09-011-2/+10
| | | | | | | | | | | | | | | | Nodes of type QtQuick.Item should only be exported Task-number: QDS-2667 Change-Id: I099b2d1d2a14ded5de46c2852306d5825a89034a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * AssetExport: Fix incorrect Node lineageVikas Pachdha2020-09-011-9/+12
| | | | | | | | | | | | Task-number: QDS-2667 Change-Id: I50bd4fbd093734d2df35fce8aed57af28469d358 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * AssetExport: Notify QML parsing errorsVikas Pachdha2020-09-011-6/+17
| | | | | | | | | | | | | | | | QML can not be exported if the document have parsing errors Task-number: QDS-2667 Change-Id: I22075789cfa5853b1607c45e2b49bb761836c0d6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-316-9/+18
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/clangtools/virtualfilesystemoverlay.h src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui src/plugins/qmldesigner/designercore/model/abstractview.cpp Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
| * AssetExport: Export the metadata oustside the project directoryVikas Pachdha2020-08-312-3/+10
| | | | | | | | | | | | | | | | Name the metadata file after the project being exported Task-number: QDS-2612 Change-Id: Ia073f6969708f2ed89552dfc7a38305563e2bef2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: More compile with namespaced Qthjk2020-08-311-0/+2
| | | | | | | | | | | | | | Amends 4886375994. Compiles for me without. Change-Id: Iaccbe6a2000d1b87008496f0e515a94aa7955061 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * QmlDesigner: Fix compilation with namespaced Qthjk2020-08-283-5/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-24544 Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Fix qmake build of unittestsChristian Stenger2020-08-271-1/+1
| | | | | | | | | | | | | | | | | | This basically continues / amends work done with e1c88116b3. Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-212-18/+28
|\| | | | | | | | | | | | | Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
| * Fix more license headersEike Ziller2020-08-191-9/+14
| | | | | | | | | | | | Fixes: QTCREATORBUG-24501 Change-Id: Ie7604f2b977f945744891b3c78e56a7818782a1d Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
| * Fix some license headersEike Ziller2020-08-191-9/+14
| | | | | | | | | | | | | | | | Missing the GPL part. Fixes: QTCREATORBUG-24501 Change-Id: I9e8e033399c050af29927d0ee735f9bcd05345bf Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-135-10/+45
|\| | | | | | | | | | | | | Conflicts: src/plugins/android/androiddeployqtstep.cpp Change-Id: Id624bad384050d567efba0700046331086cb12dd
| * Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-135-10/+45
| |\ | | | | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| | * AssetExporter: Add display name to the exported jsonVikas Pachdha2020-07-152-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | This shall be used for layer names Task-number: QDS-1556 Change-Id: I3ffce208d830f291de48105ec9cf92e76692f8bd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * AssetExport: Assign export type component to QML componentsVikas Pachdha2020-07-153-2/+10
| | | | | | | | | | | | | | | | | | Task-number: QDS-1556 Change-Id: I99c0e0219aa040b74794ab28cf0da7970a81663a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * AssetExport: Fix metadata schemaVikas Pachdha2020-07-154-9/+16
| | | | | | | | | | | | | | | | | | Task-number: QDS-1556 Change-Id: I13aef8af5094cf6a5c3f53f92643fd23492922d8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-101-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/cmakeprojectmanager/cmakebuildstep.h tests/auto/debugger/tst_namedemangler.cpp tests/auto/qml/codemodel/check/tst_check.cpp Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
| * | Fix lupdate issuesEike Ziller2020-07-171-0/+2
| | | | | | | | | | | | | | | Change-Id: I950d2f53fcc03ba447140f3c6957422ca40111b5 Reviewed-by: hjk <hjk@qt.io>
* | | QmlDesigner: Fix various compiler warningsChristian Kandeler2020-08-071-1/+1
|/ / | | | | | | | | | | | | | | | | | | -Wdangling-else -Wdeprecated-declaration -Wunused-function -Wunused-parameter Change-Id: Id655b6c9c043e2049e921b05619f596b3641bdbd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-07-021-3/+2
|\| | | | | | | Change-Id: Ia5756102fa014a8376c8b277e9a50a112c594d35
| * AssetExport: Avoid null pointer dereferencingVikas Pachdha2020-07-011-3/+2
| | | | | | | | | | Change-Id: Iea146c41800139bcf9bd8e917a47293ce3504cf4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-07-0113-42/+119
|\| | | | | | | | | | | | | Conflicts: src/tools/clangpchmanagerbackend/source/pchtaskqueue.h Change-Id: Ibe8ac2fa0eafcbcc86ac445f0be035839e06ff40
| * AssetExport: Fix build errorVikas Pachdha2020-06-301-1/+1
| | | | | | | | | | Change-Id: I11fb23e15e11a7542faccb7c1ed3db6936021db2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * AssetExport: UI improvementsVikas Pachdha2020-06-305-10/+43
| | | | | | | | | | | | | | | | Add checkbox to export assets and fix progress bar Task-number: QDS-1560 Change-Id: I8a23f4bc4a2f7ba99fcc4cf235ce94fa69ac151a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * AssetExport: Add typename and export type to metadataVikas Pachdha2020-06-302-0/+4
| | | | | | | | | | | | Task-number: QDS-1556 Change-Id: I46602334d2887024a4f1f121e3f4bf804fd01846 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * AssetExport: Let user cancel the exportVikas Pachdha2020-06-303-5/+21
| | | | | | | | | | Change-Id: I6c2ee983bf9633744a74ad1c1f01fda4cdefd0ca Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * AssetExport: Notify parser failureVikas Pachdha2020-06-292-1/+8
| | | | | | | | | | | | Change-Id: I76ed8b423c91b4ba3d5287153016ea6f1a820c8a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * AssetExport: Dump imports to metadataVikas Pachdha2020-06-292-1/+13
| | | | | | | | | | | | Task-number: QDS-1556 Change-Id: I020515e792cd12372ecef842eac01862a096543b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * AssetExport: Add unique identfier to all exported nodesVikas Pachdha2020-06-267-24/+29
| | | | | | | | | | | | Task-number: QDS-1556 Change-Id: If70b8dc2e4f02a88ba0835e2fc3a547f1e992ea5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix compile with Qt 5.12Christian Stenger2020-07-011-0/+1
| | | | | | | | | | Change-Id: I630496ae7351026d207fb5c87e2eb32e2d2aff34 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-261-1/+1
|/ | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
* AssetExport: Add generated UUID to qmlVikas Pachdha2020-06-265-7/+38
| | | | | | | | This will enable the merge when importing back from Photoshop Task-number: QDS-1555 Change-Id: I411ad65af1a33a80fcea80206aef93e2d1afa357 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Export assets from renderable nodesVikas Pachdha2020-06-268-5/+287
| | | | | | | Task-number: QDS-1555 Change-Id: I3d5b60ee8214aeee054587f45045beea020d1f13 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Refactor to accommodate asset generationVikas Pachdha2020-06-268-31/+55
| | | | | Change-Id: I57b33dc06819b3f0d1269eae10bd1131c5cb911d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add missing includeKnud Dollereder2020-06-251-0/+1
| | | | | Change-Id: I870cf23c4ae994b67a3e938dae767b7f553deb56 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* AssetExport: Add export notification when export finishesVikas Pachdha2020-06-192-1/+1
| | | | | | Change-Id: I6c9227fcc25c43415dec1afdaf95da5a1430a700 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Let user open export locationVikas Pachdha2020-06-192-5/+12
| | | | | | Change-Id: Ie508552446c9eecd6c2ee47eeb43c25230579040 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Add text node parsingVikas Pachdha2020-06-199-17/+202
| | | | | Change-Id: I86e40aef49d27515d798f8511a6ed15786b2358e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Delay the load signal from viewVikas Pachdha2020-06-191-1/+4
| | | | | | | Aparantly the QML file is not completely loaded when model is attached Change-Id: If8c342c057a1cd33b6f7510bbf9f56a1f3369961 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExporter: Let user select files to exportVikas Pachdha2020-06-1810-123/+408
| | | | | | | | | | Refine asset exporter dialog. Add progress bar, export notification, path chooser and other small UI changes Task-number: QDS-1560 Change-Id: Iaba61575581171e7e1495ebfaf2e345546fb7400 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExporter: Add import notification taskVikas Pachdha2020-06-187-4/+113
| | | | | | | Task-number: QDS-1560 Change-Id: I09c14c22206c299f7a50f1a843c6dc4ebac670e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExporter: Add plugin to cmake and qbs build systemVikas Pachdha2020-06-171-0/+51
| | | | | Change-Id: I2b48a854ed4e5e94cab73883f8b0f41d0ed15697 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AssetExport: Add missing plugin jsonVikas Pachdha2020-06-151-0/+6
| | | | | | Change-Id: Ib395cb03610eeabb657e11961cffc22d8d6cd714 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExporter: Add basic infrastructure for the pluginVikas Pachdha2020-06-1220-0/+1443
Adds export action, basic UI and workflow classes Change-Id: If019a8fa48cacaf7e7665335c53b3adeeb257b07 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 02:28:03 +0000