diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-03-30 13:34:12 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-03-30 13:30:42 +0000 |
| commit | adb664f52128b3c28323a5d4dccedc204dec8b34 (patch) | |
| tree | 5bc4573e921a37f7ba46d73eba16c6f08db37da4 /src/plugins/CMakeLists.txt | |
| parent | 6f765181c9b9e716f3ae746183cdeac2459ac194 (diff) | |
| parent | 5b28748554b3f97c4e163606208878d573f2a655 (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/libs/utils/filepath.cpp
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
tests/unit/unittest/CMakeLists.txt
Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
Diffstat (limited to 'src/plugins/CMakeLists.txt')
| -rw-r--r-- | src/plugins/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 02f13199140..33aa3db6a04 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -54,17 +54,19 @@ add_subdirectory(mesonprojectmanager) add_subdirectory(perforce) add_subdirectory(qmakeprojectmanager) add_subdirectory(qmljstools) -add_subdirectory(qmlprojectmanager) add_subdirectory(scxmleditor) add_subdirectory(subversion) add_subdirectory(compilationdatabaseprojectmanager) add_subdirectory(languageclient) +add_subdirectory(qmldesignerbase) + # Level 6: add_subdirectory(cmakeprojectmanager) add_subdirectory(debugger) add_subdirectory(coco) add_subdirectory(gitlab) +add_subdirectory(qmlprojectmanager) # Level 7: add_subdirectory(android) |