diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
| commit | dbb62016052ad70e8e3dffb60a419504c9eb6dac (patch) | |
| tree | 7926ab117c9932be15b8886ba5230048da97bc07 /src/plugins/qmldesigner/qmldesignerplugin.cpp | |
| parent | 526579b09d1be00ef2f0e371e0c57064777e6538 (diff) | |
| parent | cc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
Diffstat (limited to 'src/plugins/qmldesigner/qmldesignerplugin.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 3022bd80be..938a718d7c 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -37,7 +37,6 @@ #include <connectionview.h> #include <sourcetool/sourcetool.h> #include <colortool/colortool.h> -#include <annotationeditor/annotationtool.h> #include <curveeditor/curveeditorview.h> #include <formeditor/transitiontool.h> #include <texttool/texttool.h> @@ -250,7 +249,6 @@ bool QmlDesignerPlugin::delayedInitialize() d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool); - d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::AnnotationTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::PathTool); d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TransitionTool); |