Designer: Move dependency from CppEditor to CppTools

That makes CppEditor almost a leaf node in the project dependencies.

diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index 973cd79..3f6e81e 100644 (file)
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec
@@ -16,6 +16,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <dependencyList>
         <dependency name="Core" version="2.1.81"/>
 <!-- For compiling with CPP support enabled -->
-        <dependency name="CppEditor" version="2.1.81"/>
+        <dependency name="CppTools" version="2.1.81"/>
+        <dependency name="TextEditor" version="2.1.81"/>
     </dependencyList>
 </plugin>

diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri
index 4c98d46..f19342e 100644 (file)
--- a/src/plugins/designer/designer_dependencies.pri
+++ b/src/plugins/designer/designer_dependencies.pri
@@ -1,3 +1,5 @@
-include(../../plugins/cppeditor/cppeditor.pri)
+include(../../libs/cplusplus/cplusplus.pri)
+include(../../plugins/cpptools/cpptools.pri)
+include(../../plugins/texteditor/texteditor.pri)
 include(../../libs/utils/utils.pri)
 include(../../plugins/coreplugin/coreplugin.pri)

diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 9f842de..ea7c04c 100644 (file)
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -34,7 +34,6 @@
 
 #ifdef CPP_ENABLED
 #  include "formclasswizard.h"
-#  include <cppeditor/cppeditorconstants.h>
 #  include "cppsettingspage.h"
 #endif
 

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index a2f15f6..98d7db7 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -87,7 +87,7 @@ plugin_imageviewer.subdir = imageviewer
 plugin_imageviewer.depends = plugin_coreplugin
 
 plugin_designer.subdir = designer
-plugin_designer.depends = plugin_coreplugin plugin_cppeditor plugin_projectexplorer
+plugin_designer.depends = plugin_coreplugin plugin_cpptools plugin_projectexplorer plugin_texteditor
 
 plugin_vcsbase.subdir = vcsbase
 plugin_vcsbase.depends = plugin_find