diff options
| author | dt <qtc-committer@nokia.com> | 2010-09-30 18:01:16 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-10-04 15:10:01 +0200 |
| commit | a84ad42741d4f3ac2f35ba3303f94a034f2d50ba (patch) | |
| tree | 0535a60182c0e443b1709a9c865651c4b33075e9 | |
| parent | d6bff094b2ba0d99f337502ee51fa0fcd0257758 (diff) | |
| download | qt-creator-a84ad42741d4f3ac2f35ba3303f94a034f2d50ba.tar.gz | |
Designer: Move dependency from CppEditor to CppTools
That makes CppEditor almost a leaf node in the project dependencies.
| -rw-r--r-- | src/plugins/designer/Designer.pluginspec | 3 | ||||
| -rw-r--r-- | src/plugins/designer/designer_dependencies.pri | 4 | ||||
| -rw-r--r-- | src/plugins/designer/formeditorplugin.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec index 973cd7931c..3f6e81ea86 100644 --- 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 4c98d46428..f19342ea3c 100644 --- 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 9f842de177..ea7c04cac7 100644 --- 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 a2f15f6ed4..98d7db777b 100644 --- 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 |