diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-11-01 15:38:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-11-01 15:38:49 +0100 |
| commit | b402f3548126a7616deff42110bb8fb915b1c75e (patch) | |
| tree | ffb3ef2955e8279890666063fa4e2df4eac9f06c /share/qtcreator/templates/wizards | |
| parent | de88d1c437b8c43428921738244b0ad4d006f4d9 (diff) | |
| parent | 02f7c9c3eb290bbd362349dab684606ad93b6e60 (diff) | |
| download | qt-creator-b402f3548126a7616deff42110bb8fb915b1c75e.tar.gz | |
Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
src/plugins/qmldesigner/designercore/model/abstractview.cpp
src/plugins/qmldesigner/designercore/model/import.cpp
src/plugins/qmldesigner/designercore/model/model_p.h
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
Diffstat (limited to 'share/qtcreator/templates/wizards')
| -rw-r--r-- | share/qtcreator/templates/wizards/files/effect/file.qep | 0 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/files/effect/wizard.json | 40 |
2 files changed, 40 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/files/effect/file.qep b/share/qtcreator/templates/wizards/files/effect/file.qep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/share/qtcreator/templates/wizards/files/effect/file.qep diff --git a/share/qtcreator/templates/wizards/files/effect/wizard.json b/share/qtcreator/templates/wizards/files/effect/wizard.json new file mode 100644 index 0000000000..d966f097ed --- /dev/null +++ b/share/qtcreator/templates/wizards/files/effect/wizard.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "supportedProjectTypes": [ ], + "id": "J.QEP", + "category": "U.QEP", + "trDescription": "Creates an Effect Maker file.", + "trDisplayName": "Effect File (Effect Maker)", + "trDisplayCategory": "Effects", + "iconText": "qep", + "platformIndependent": true, + "enabled": true, + + "options": { "key": "DefaultSuffix", "value": "qep" }, + + "pages" : + [ + { + "trDisplayName": "Location", + "trShortTitle": "Location", + "typeId": "File" + }, + { + "trDisplayName": "Project Management", + "trShortTitle": "Summary", + "typeId": "Summary" + } + ], + "generators" : + [ + { + "typeId": "File", + "data": + { + "source": "file.qep", + "target": "%{JS: Util.fileName(value('TargetPath'), value('DefaultSuffix'))}", + "openInEditor": false + } + } + ] +} |