diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-22 16:49:37 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-22 14:50:56 +0000 |
| commit | 846f8dba92cb5e94861573fa82b5c9430fabdb1b (patch) | |
| tree | b9f25735cabcac99c6285c6cc7a3f8e9d3328bc6 /src/plugins/qmldesigner/CMakeLists.txt | |
| parent | dfe77895068ef74ed495c7053576dcdf6b8ad7a1 (diff) | |
| parent | c3fd118c6222d568b9455c1a7bca1271be79502f (diff) | |
Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp
Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
Diffstat (limited to 'src/plugins/qmldesigner/CMakeLists.txt')
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index ab736137041..23ce1108e7e 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -948,7 +948,7 @@ extend_qtc_plugin(QmlDesigner SOURCES_PREFIX components/richtexteditor SOURCES hyperlinkdialog.cpp hyperlinkdialog.h hyperlinkdialog.ui - richtexteditor.cpp richtexteditor.h hyperlinkdialog.ui + richtexteditor.cpp richtexteditor.h richtexteditorproxy.cpp richtexteditorproxy.h ) @@ -1125,13 +1125,8 @@ extend_qtc_plugin(componentsplugin extend_qtc_plugin(componentsplugin SOURCES_PREFIX componentsplugin SOURCES - addtabdesigneraction.cpp addtabdesigneraction.h - addtabtotabviewdialog.cpp addtabtotabviewdialog.h - addtabtotabviewdialog.ui componentsplugin.cpp componentsplugin.h componentsplugin.qrc - entertabdesigneraction.cpp entertabdesigneraction.h - tabviewindexmodel.cpp tabviewindexmodel.h ) add_qtc_plugin(qmlpreviewplugin |