From dfd28a1d32ab7bf9b13ab9ce0e178b73efda6af5 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 15 Mar 2012 13:42:07 +0100
Subject: [PATCH] Fix build breakage after making plugins dependent on
cpptools.
Change-Id: Iae2c15efe25580fb616bdc3dd4b8ff3581cd481a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/libs/cplusplus/cplusplus.qbs | 4 ----
src/plugins/analyzerbase/AnalyzerBase.pluginspec.in | 1 +
src/plugins/analyzerbase/analyzerbase.qbs | 2 +-
src/plugins/analyzerbase/analyzerbase_dependencies.pri | 1 +
src/plugins/cpptools/cpptools.qbs | 6 +++++-
src/plugins/debugger/Debugger.pluginspec.in | 1 +
src/plugins/plugins.pro | 4 ++++
src/plugins/qmljstools/qmljstools.qbs | 2 +-
src/plugins/todo/Todo.pluginspec.in | 1 +
src/plugins/vcsbase/VcsBase.pluginspec.in | 1 +
src/plugins/vcsbase/vcsbase.qbs | 2 +-
11 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 705cbfabc73..7b1aa6e254b 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -122,8 +122,6 @@ DynamicLibrary {
"Macro.h",
"MatchingText.cpp",
"MatchingText.h",
- "ModelManagerInterface.cpp",
- "ModelManagerInterface.h",
"NamePrettyPrinter.cpp",
"NamePrettyPrinter.h",
"Overview.cpp",
@@ -142,8 +140,6 @@ DynamicLibrary {
"SnapshotSymbolVisitor.h",
"SymbolNameVisitor.cpp",
"SymbolNameVisitor.h",
- "TypeHierarchyBuilder.cpp",
- "TypeHierarchyBuilder.h",
"TypeOfExpression.cpp",
"TypeOfExpression.h",
"TypePrettyPrinter.cpp",
diff --git a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
index 3bcb94e25ce..70beca98a1c 100644
--- a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
+++ b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 9ca081487e4..7b8f2ff30fd 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -7,7 +7,7 @@ QtcPlugin {
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "Core" }
- Depends { name: "CPlusPlus" }
+ Depends { name: "CppTools" }
Depends { name: "RemoteLinux" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
index 65e1ef20faa..8ac7abd3875 100644
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
@@ -2,3 +2,4 @@ include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/cplusplus/cplusplus.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/remotelinux/remotelinux.pri)
+include(../../plugins/cpptools/cpptools.pri)
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 34bd225eaea..4608cffe8c9 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -100,7 +100,11 @@ QtcPlugin {
"uicodecompletionsupport.h",
"cppcompletionassistprovider.cpp",
"cppcompletionassistprovider.h",
- "cppcodestylepreferencesfactory.h"
+ "cppcodestylepreferencesfactory.h",
+ "ModelManagerInterface.cpp",
+ "ModelManagerInterface.h",
+ "TypeHierarchyBuilder.cpp",
+ "TypeHierarchyBuilder.h"
]
}
diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in
index 1b4327cc0ae..77d13834f8a 100644
--- a/src/plugins/debugger/Debugger.pluginspec.in
+++ b/src/plugins/debugger/Debugger.pluginspec.in
@@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
<!-- Debugger plugin adds items to the editor\'s context menu -->
<dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
</dependencyList>
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index a05b953f7ff..0bfef636e1b 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -120,6 +120,7 @@ plugin_vcsbase.depends = plugin_find
plugin_vcsbase.depends += plugin_texteditor
plugin_vcsbase.depends += plugin_coreplugin
plugin_vcsbase.depends += plugin_projectexplorer
+plugin_vcsbase.depends += plugin_cpptools
plugin_perforce.subdir = perforce
plugin_perforce.depends = plugin_vcsbase
@@ -253,6 +254,7 @@ plugin_qmldesigner.depends += plugin_qmljseditor
plugin_qmldesigner.depends += plugin_projectexplorer
plugin_qmldesigner.depends += plugin_qt4projectmanager
plugin_qmldesigner.depends += plugin_qmlprojectmanager
+plugin_qmldesigner.depends += plugin_cpptools
plugin_qmljsinspector.subdir = qmljsinspector
plugin_qmljsinspector.depends += plugin_projectexplorer
@@ -283,6 +285,7 @@ plugin_analyzerbase.subdir = analyzerbase
plugin_analyzerbase.depends = plugin_coreplugin
plugin_analyzerbase.depends += plugin_projectexplorer
plugin_analyzerbase.depends += plugin_remotelinux
+plugin_analyzerbase.depends += plugin_cpptools
plugin_valgrind.subdir = valgrind
plugin_valgrind.depends = plugin_coreplugin
@@ -300,6 +303,7 @@ plugin_qmljstools.depends = plugin_projectexplorer
plugin_qmljstools.depends += plugin_coreplugin
plugin_qmljstools.depends += plugin_texteditor
plugin_qmljstools.depends += plugin_qtsupport
+plugin_qmljstools.depends += plugin_cpptools
plugin_macros.subdir = macros
plugin_macros.depends = plugin_texteditor
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 46366111292..9c13cbbd1eb 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -8,7 +8,7 @@ QtcPlugin {
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "Core" }
Depends { name: "LanguageUtils" }
- Depends { name: "CPlusPlus" }
+ Depends { name: "CppTools" }
Depends { name: "QmlJS" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/todo/Todo.pluginspec.in b/src/plugins/todo/Todo.pluginspec.in
index edbb711cd60..ac2f43aba1d 100644
--- a/src/plugins/todo/Todo.pluginspec.in
+++ b/src/plugins/todo/Todo.pluginspec.in
@@ -16,5 +16,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/vcsbase/VcsBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in
index 276ae7e0dd8..9d0844c05bb 100644
--- a/src/plugins/vcsbase/VcsBase.pluginspec.in
+++ b/src/plugins/vcsbase/VcsBase.pluginspec.in
@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 3db7e2c69bb..16784fecee7 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "CPlusPlus" }
+ Depends { name: "CppTools" }
cpp.includePaths: [
".",
--
GitLab