diff options
| author | Tim Jenssen <[email protected]> | 2023-05-22 19:48:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2023-05-22 21:13:40 +0200 |
| commit | 1b6c0ff56c8d48c5b5bb8044b113cd580f6d5ee3 (patch) | |
| tree | 25878f9091506fd282a338a2c5f98b357d47134e /src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | |
| parent | 3dcdbe9069c452e2f0eacb925aa7412e63dc4762 (diff) | |
| parent | df7398e2c5f3c1595f32c7484ac1e804d83a01ca (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
coin/instructions/build.yaml
doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
src/libs/CMakeLists.txt
src/libs/advanceddockingsystem/dockmanager.cpp
src/libs/advanceddockingsystem/workspacedialog.cpp
src/plugins/coreplugin/manhattanstyle.cpp
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmldesigner/components/formeditor/toolbox.cpp
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
src/plugins/qmlprojectmanager/qmlproject.cpp
src/tools/qml2puppet/CMakeLists.txt
tests/unit/unittest/CMakeLists.txt
Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectmanager.qbs')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index d4938c8d798..e4e4d0bc247 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -34,12 +34,14 @@ QtcPlugin { } Group { - name: "File Format" - prefix: "fileformat/" + name: "Build System" + prefix: "buildsystem/" files: [ - "filefilteritems.cpp", "filefilteritems.h", - "qmlprojectfileformat.cpp", "qmlprojectfileformat.h", - "qmlprojectitem.cpp", "qmlprojectitem.h", + "qmlbuildsystem.cpp", "qmlbuildsystem.h", + "projectitem/filefilteritems.cpp", "projectitem/filefilteritems.h", + "projectitem/qmlprojectitem.cpp", "projectitem/qmlprojectitem.h", + "projectitem/converters.h", + "projectnode/qmlprojectnodes.cpp", "projectnode/qmlprojectnodes.h" ] } @@ -56,7 +58,7 @@ QtcPlugin { "cmakeprojectconverterdialog.cpp", "cmakeprojectconverterdialog.h", ] } - + Group { name: "QML Project File Generator" prefix: "qmlprojectgen/" |