Commit 8c1c2847 authored by Tobias Hunger's avatar Tobias Hunger

Qbs/qmake: Fix dependencies of plugins

... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 62117ee2
...@@ -6,10 +6,12 @@ QtcPlugin { ...@@ -6,10 +6,12 @@ QtcPlugin {
name: "AnalyzerBase" name: "AnalyzerBase"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "QtcSsh" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "QtcSsh" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
files: [ files: [
......
QTC_PLUGIN_NAME = AnalyzerBase QTC_PLUGIN_NAME = AnalyzerBase
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
cplusplus \ cplusplus \
ssh extensionsystem \
ssh \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
projectexplorer \ projectexplorer \
......
...@@ -9,4 +9,8 @@ QTC_PLUGIN_DEPENDS += \ ...@@ -9,4 +9,8 @@ QTC_PLUGIN_DEPENDS += \
analyzerbase analyzerbase
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
qmldebug \
ssh \
utils utils
...@@ -6,9 +6,10 @@ QtcPlugin { ...@@ -6,9 +6,10 @@ QtcPlugin {
name: "AutotoolsProjectManager" name: "AutotoolsProjectManager"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
files: [ files: [
......
QTC_PLUGIN_NAME = AutotoolsProjectManager QTC_PLUGIN_NAME = AutotoolsProjectManager
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
projectexplorer \ projectexplorer \
coreplugin \ coreplugin \
......
...@@ -6,11 +6,14 @@ QtcPlugin { ...@@ -6,11 +6,14 @@ QtcPlugin {
name: "BareMetal" name: "BareMetal"
provider: "Sander" provider: "Sander"
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "Debugger" } Depends { name: "Debugger" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
files: [ files: [
"baremetalconstants.h", "baremetalconstants.h",
......
QTC_PLUGIN_NAME = BareMetal QTC_PLUGIN_NAME = BareMetal
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
# nothing here at this time extensionsystem \
ssh \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
debugger \ debugger \
......
...@@ -6,6 +6,8 @@ QtcPlugin { ...@@ -6,6 +6,8 @@ QtcPlugin {
name: "Bazaar" name: "Bazaar"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "VcsBase" } Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Bazaar QTC_PLUGIN_NAME = Bazaar
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
......
...@@ -6,6 +6,9 @@ QtcPlugin { ...@@ -6,6 +6,9 @@ QtcPlugin {
name: "BinEditor" name: "BinEditor"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = BinEditor QTC_PLUGIN_NAME = BinEditor
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
......
...@@ -6,6 +6,8 @@ QtcPlugin { ...@@ -6,6 +6,8 @@ QtcPlugin {
name: "Bookmarks" name: "Bookmarks"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = Bookmarks QTC_PLUGIN_NAME = Bookmarks
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
projectexplorer \ projectexplorer \
coreplugin \ coreplugin \
......
...@@ -6,9 +6,11 @@ QtcPlugin { ...@@ -6,9 +6,11 @@ QtcPlugin {
name: "ClassView" name: "ClassView"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = ClassView QTC_PLUGIN_NAME = ClassView
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
cplusplus \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
......
...@@ -9,6 +9,8 @@ QtcPlugin { ...@@ -9,6 +9,8 @@ QtcPlugin {
pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")}) pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = ClearCase QTC_PLUGIN_NAME = ClearCase
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
projectexplorer \ projectexplorer \
......
...@@ -6,9 +6,11 @@ QtcPlugin { ...@@ -6,9 +6,11 @@ QtcPlugin {
name: "CMakeProjectManager" name: "CMakeProjectManager"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
......
QTC_PLUGIN_NAME = CMakeProjectManager QTC_PLUGIN_NAME = CMakeProjectManager
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
projectexplorer \ projectexplorer \
......
...@@ -13,6 +13,7 @@ QtcPlugin { ...@@ -13,6 +13,7 @@ QtcPlugin {
} }
Depends { name: "Utils" } Depends { name: "Utils" }
Depends { name: "Aggregation" } Depends { name: "Aggregation" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
cpp.dynamicLibraries: { cpp.dynamicLibraries: {
......
QTC_PLUGIN_NAME = Core QTC_PLUGIN_NAME = Core
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \ extensionsystem \
utils utils
...@@ -6,6 +6,8 @@ QtcPlugin { ...@@ -6,6 +6,8 @@ QtcPlugin {
name: "CodePaster" name: "CodePaster"
Depends { name: "Qt"; submodules: ["widgets", "network"] } Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = CodePaster QTC_PLUGIN_NAME = CodePaster
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
coreplugin coreplugin
...@@ -7,11 +7,15 @@ QtcPlugin { ...@@ -7,11 +7,15 @@ QtcPlugin {
name: "CppEditor" name: "CppEditor"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
files: [ files: [
......
QTC_PLUGIN_NAME = CppEditor QTC_PLUGIN_NAME = CppEditor
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils \ utils \
cplusplus cplusplus
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
......
...@@ -7,11 +7,13 @@ QtcPlugin { ...@@ -7,11 +7,13 @@ QtcPlugin {
name: "CppTools" name: "CppTools"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "CPlusPlus" }
Depends { name: "LanguageUtils" }
cpp.defines: base cpp.defines: base
Properties { Properties {
......
QTC_PLUGIN_NAME = CppTools QTC_PLUGIN_NAME = CppTools
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
languageutils \ aggregation \
cplusplus cplusplus \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
projectexplorer \ projectexplorer \
......
...@@ -6,6 +6,8 @@ QtcPlugin { ...@@ -6,6 +6,8 @@ QtcPlugin {
name: "CVS" name: "CVS"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "VcsBase" } Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = CVS QTC_PLUGIN_NAME = CVS
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
......
...@@ -6,15 +6,18 @@ QtcPlugin { ...@@ -6,15 +6,18 @@ QtcPlugin {
name: "Debugger" name: "Debugger"
Depends { name: "Qt"; submodules: ["widgets", "network", "script"] } Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "QtcSsh" }
Depends { name: "QmlDebug" }
Depends { name: "LanguageUtils" }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "CPlusPlus" }
Depends { name: "QmlJS" }
Depends { name: "QmlDebug" }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
cpp.includePaths: base.concat(["../../shared/registryaccess"]) cpp.includePaths: base.concat(["../../shared/registryaccess"])
......
QTC_PLUGIN_NAME = Debugger QTC_PLUGIN_NAME = Debugger
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
cplusplus \ cplusplus \
extensionsystem \
languageutils \
utils \ utils \
qmldebug \ qmldebug \
qmljs \ qmljs \
......
...@@ -7,8 +7,10 @@ QtcPlugin { ...@@ -7,8 +7,10 @@ QtcPlugin {
name: "Designer" name: "Designer"
Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
Depends { name: "Core" }
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = Designer QTC_PLUGIN_NAME = Designer
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
cplusplus \ cplusplus \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
cpptools \ cpptools \
......
...@@ -6,10 +6,12 @@ QtcPlugin { ...@@ -6,10 +6,12 @@ QtcPlugin {
name: "DiffEditor" name: "DiffEditor"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
files: [ files: [
"diffeditor.cpp", "diffeditor.cpp",
"diffeditor.h", "diffeditor.h",
......
QTC_PLUGIN_NAME = DiffEditor QTC_PLUGIN_NAME = DiffEditor
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
......
...@@ -5,9 +5,12 @@ import QtcPlugin ...@@ -5,9 +5,12 @@ import QtcPlugin
QtcPlugin { QtcPlugin {
name: "FakeVim" name: "FakeVim"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "Qt.widgets" }
files: [ files: [
"fakevimactions.cpp", "fakevimactions.cpp",
......
QTC_PLUGIN_NAME = FakeVim QTC_PLUGIN_NAME = FakeVim
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
texteditor texteditor
...@@ -6,8 +6,9 @@ QtcPlugin { ...@@ -6,8 +6,9 @@ QtcPlugin {
name: "GenericProjectManager" name: "GenericProjectManager"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = GenericProjectManager QTC_PLUGIN_NAME = GenericProjectManager
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
projectexplorer \ projectexplorer \
......
...@@ -6,6 +6,8 @@ QtcPlugin { ...@@ -6,6 +6,8 @@ QtcPlugin {
name: "Git" name: "Git"
Depends { name: "Qt"; submodules: ["widgets", "network"] } Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "VcsBase" } Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Git QTC_PLUGIN_NAME = Git
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
extensionsystem \
utils utils
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
texteditor \ texteditor \
......
...@@ -6,12 +6,14 @@ QtcPlugin { ...@@ -6,12 +6,14 @@ QtcPlugin {
name: "GLSLEditor" name: "GLSLEditor"
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "GLSL" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "GLSL" }
Depends { name: "CPlusPlus" }
files: [ files: [
"glslautocompleter.cpp", "glslautocompleter.cpp",
......
QTC_PLUGIN_NAME = GLSLEditor QTC_PLUGIN_NAME = GLSLEditor
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
glsl \ glsl \
utils \ utils \
cplusplus cplusplus
......
QTC_PLUGIN_NAME = HelloWorld QTC_PLUGIN_NAME = HelloWorld
QTC_LIB_DEPENDS += \ QTC_LIB_DEPENDS += \
# nothing here at this time extensionsystem
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin coreplugin
......
...@@ -10,8 +10,11 @@ QtcPlugin { ...@@ -10,8 +10,11 @@ QtcPlugin {
condition: Qt.core.versionMajor >= 5; condition: Qt.core.versionMajor >= 5;
name: "Qt"; submodules: ["printsupport", "webkitwidgets"]; name: "Qt"; submodules: ["printsupport", "webkitwidgets"];
} }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"]) cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
......
QTC_PLUGIN_NAME = Help QTC_PLUGIN_NAME = Help
QTC_LIB_DEPENDS += \