diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-10-05 15:01:35 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-10-05 15:53:42 +0200 |
| commit | 85ea2758ac063174c8d62b51dbfbfee9291d65c4 (patch) | |
| tree | 33427a0cf8858ec82bb6a1c4aed05e8a4b85660f /src/plugins/CMakeLists.txt | |
| parent | 257af1ebd80e0c0b9ac2e4104c6aea5c4d9e6281 (diff) | |
| parent | 97ca8cc2700fb606fdcc1e3f089e904e6d308aba (diff) | |
Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
share/qtcreator/themes/dark.creatortheme
share/qtcreator/themes/default.creatortheme
share/qtcreator/themes/flat-dark.creatortheme
share/qtcreator/themes/flat-light.creatortheme
share/qtcreator/themes/flat.creatortheme
src/libs/utils/CMakeLists.txt
src/plugins/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
Diffstat (limited to 'src/plugins/CMakeLists.txt')
| -rw-r--r-- | src/plugins/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index d10f434eb10..5d7316dee61 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -112,4 +112,8 @@ add_subdirectory(mcusupport) add_subdirectory(saferenderer) add_subdirectory(copilot) add_subdirectory(terminal) + +if (WITH_QMLDESIGNER) + add_subdirectory(effectmakernew) +endif() add_subdirectory(compilerexplorer) |