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 {
name: "AnalyzerBase"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "QtcSsh" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtcSsh" }
Depends { name: "TextEditor" }
files: [
......
QTC_PLUGIN_NAME = AnalyzerBase
QTC_LIB_DEPENDS += \
cplusplus \
ssh
extensionsystem \
ssh \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -9,4 +9,8 @@ QTC_PLUGIN_DEPENDS += \
analyzerbase
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
qmldebug \
ssh \
utils
......@@ -6,9 +6,10 @@ QtcPlugin {
name: "AutotoolsProjectManager"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "CppTools" }
files: [
......
QTC_PLUGIN_NAME = AutotoolsProjectManager
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
projectexplorer \
coreplugin \
......
......@@ -6,11 +6,14 @@ QtcPlugin {
name: "BareMetal"
provider: "Sander"
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "Debugger" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
files: [
"baremetalconstants.h",
......
QTC_PLUGIN_NAME = BareMetal
QTC_LIB_DEPENDS += \
# nothing here at this time
extensionsystem \
ssh \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
debugger \
......
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "Bazaar"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Bazaar
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -6,6 +6,9 @@ QtcPlugin {
name: "BinEditor"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = BinEditor
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "Bookmarks"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = Bookmarks
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
projectexplorer \
coreplugin \
......
......@@ -6,9 +6,11 @@ QtcPlugin {
name: "ClassView"
Depends { name: "Qt.widgets" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = ClassView
QTC_LIB_DEPENDS += \
cplusplus \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
......
......@@ -9,6 +9,8 @@ QtcPlugin {
pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = ClearCase
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
projectexplorer \
......
......@@ -6,9 +6,11 @@ QtcPlugin {
name: "CMakeProjectManager"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "QtSupport" }
......
QTC_PLUGIN_NAME = CMakeProjectManager
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -13,6 +13,7 @@ QtcPlugin {
}
Depends { name: "Utils" }
Depends { name: "Aggregation" }
Depends { name: "app_version_header" }
cpp.dynamicLibraries: {
......
QTC_PLUGIN_NAME = Core
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "CodePaster"
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
......
QTC_PLUGIN_NAME = CodePaster
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
coreplugin
......@@ -7,11 +7,15 @@ QtcPlugin {
name: "CppEditor"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "app_version_header" }
files: [
......
QTC_PLUGIN_NAME = CppEditor
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils \
cplusplus
QTC_PLUGIN_DEPENDS += \
......
......@@ -7,11 +7,13 @@ QtcPlugin {
name: "CppTools"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "CPlusPlus" }
Depends { name: "LanguageUtils" }
cpp.defines: base
Properties {
......
QTC_PLUGIN_NAME = CppTools
QTC_LIB_DEPENDS += \
languageutils \
cplusplus
aggregation \
cplusplus \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "CVS"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = CVS
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -6,15 +6,18 @@ QtcPlugin {
name: "Debugger"
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: "CppTools" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "CPlusPlus" }
Depends { name: "QmlJS" }
Depends { name: "QmlDebug" }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
cpp.includePaths: base.concat(["../../shared/registryaccess"])
......
QTC_PLUGIN_NAME = Debugger
QTC_LIB_DEPENDS += \
aggregation \
cplusplus \
extensionsystem \
languageutils \
utils \
qmldebug \
qmljs \
......
......@@ -7,8 +7,10 @@ QtcPlugin {
name: "Designer"
Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = Designer
QTC_LIB_DEPENDS += \
cplusplus \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
cpptools \
......
......@@ -6,10 +6,12 @@ QtcPlugin {
name: "DiffEditor"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
files: [
"diffeditor.cpp",
"diffeditor.h",
......
QTC_PLUGIN_NAME = DiffEditor
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -5,9 +5,12 @@ import QtcPlugin
QtcPlugin {
name: "FakeVim"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Qt.widgets" }
files: [
"fakevimactions.cpp",
......
QTC_PLUGIN_NAME = FakeVim
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor
......@@ -6,8 +6,9 @@ QtcPlugin {
name: "GenericProjectManager"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = GenericProjectManager
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "Git"
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Git
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -6,12 +6,14 @@ QtcPlugin {
name: "GLSLEditor"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "GLSL" }
Depends { name: "CPlusPlus" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "CppTools" }
Depends { name: "GLSL" }
Depends { name: "CPlusPlus" }
files: [
"glslautocompleter.cpp",
......
QTC_PLUGIN_NAME = GLSLEditor
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
glsl \
utils \
cplusplus
......
QTC_PLUGIN_NAME = HelloWorld
QTC_LIB_DEPENDS += \
# nothing here at this time
extensionsystem
QTC_PLUGIN_DEPENDS += \
coreplugin
......
......@@ -10,8 +10,11 @@ QtcPlugin {
condition: Qt.core.versionMajor >= 5;
name: "Qt"; submodules: ["printsupport", "webkitwidgets"];
}
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "app_version_header" }
cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
......
QTC_PLUGIN_NAME = Help
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin
......@@ -6,6 +6,9 @@ QtcPlugin {
name: "ImageViewer"
Depends { name: "Qt"; submodules: ["widgets", "svg"] }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
files: [
......
QTC_PLUGIN_NAME = ImageViewer
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin
......@@ -6,8 +6,12 @@ QtcPlugin {
name: "Macros"
Depends { name: "Qt.widgets" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "app_version_header" }
files: [
......
QTC_PLUGIN_NAME = Macros
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "Mercurial"
Depends { name: "Qt.widgets" }
Depends { name: "Utils"}
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Mercurial
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -6,6 +6,8 @@ QtcPlugin {
name: "Perforce"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "VcsBase" }
......
QTC_PLUGIN_NAME = Perforce
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
texteditor \
......
......@@ -8,9 +8,12 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
Depends { name: "Aggregation" }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "QtcSsh" }
cpp.defines: base.concat("QTC_CPU=X86Architecture")
Properties {
......
QTC_PLUGIN_NAME = ProjectExplorer
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
ssh \
utils
QTC_PLUGIN_DEPENDS += \
......
......@@ -6,9 +6,10 @@ QtcPlugin {
name: "PythonEditor"
Depends { name: "Qt.widgets" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "CppTools" }
Depends { name: "QtSupport" }
Depends { name: "ProjectExplorer" }
......
QTC_PLUGIN_NAME = PythonEditor
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor \
......
......@@ -30,15 +30,10 @@ QtcPlugin {
condition: project.buildQbsProjectManager
Depends { name: "Qt"; submodules: [ "widgets", "script" ] }
Depends { name: "ProjectExplorer" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "TextEditor" }
Depends { name: "QtSupport" }
Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" }
property bool useInternalQbsProducts: project.qbsSubModuleExists && !project.useExternalQbs
Depends { name: "Qt"; submodules: [ "widgets", "script" ] }
Depends { name: "Aggregation" }
Depends {
name: "qbscore"
condition: product.useInternalQbsProducts
......@@ -47,6 +42,14 @@ QtcPlugin {
name: "qbsqtprofilesetup"
condition: product.useInternalQbsProducts
}
Depends { name: "QmlJS" }
Depends { name: "Utils" }
Depends { name: "ProjectExplorer" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "QtSupport" }
Depends { name: "QmlJSTools" }
cpp.defines: base.concat([
'QML_BUILD_STATIC_LIB',
......
QTC_PLUGIN_NAME = QbsProjectManager
# The Qbs libraries require special code and can not be covered here!
QTC_LIB_DEPENDS += \
aggregation \
extensionsystem \
qmljs
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -6,11 +6,14 @@ QtcPlugin {
name: "QmakeProjectManager"
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Aggregation" }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "CppTools" }
Depends { name: "QmlJS" }
Depends { name: "TextEditor" }
Depends { name: "QmlJSTools" }
......
QTC_PLUGIN_NAME = QmakeProjectManager
QTC_LIB_DEPENDS += \
qmljs
aggregation \
extensionsystem \
qmljs \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
......
......@@ -6,14 +6,16 @@ QtcPlugin {
name: "QmlJSEditor"
Depends { name: "Qt"; submodules: ["widgets", "script"] }
Depends { name: "Aggregation" }
Depends { name: "LanguageUtils" }
Depends { name: "Utils" }
Depends { name: "QmlEditorWidgets" }
Depends { name: "QmlJS" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlJSTools" }
Depends { name: "QmlJS" }
Depends { name: "LanguageUtils" }
Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" }
files: [
"jsfilewizard.cpp",
......