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/qmlprojectplugin.cpp | |
| 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/qmlprojectplugin.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 2ead9de6da9..2876c3c366a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -10,7 +10,6 @@ #include "projectfilecontenttools.h" #include "cmakegen/cmakeprojectconverter.h" #include "cmakegen/generatecmakelists.h" -#include "qmlprojectgen/qmlprojectgenerator.h" #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> |