feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove duplicate module dependencies from qbs files.

Browse Source 
These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-05-27 10:06:36 +02:00
committed by Joerg Bornemann
parent 97952cfde2
commit 24e81241a5
45 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/aggregation/aggregation.qbs
View File

@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary { QtcLibrary {
name: "Aggregation" name: "Aggregation"
Depends { name: "cpp" }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
cpp.defines: base.concat("AGGREGATION_LIBRARY") cpp.defines: base.concat("AGGREGATION_LIBRARY")

2
src/libs/cplusplus/cplusplus.qbs
View File

@@ -11,7 +11,6 @@ QtcLibrary {
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Group { Group {
@@ -169,7 +168,6 @@ QtcLibrary {
] ]
Export { Export {
Depends { name: "cpp" }
cpp.includePaths: [ cpp.includePaths: [
".", ".",
"../3rdparty", "../3rdparty",

1
src/libs/extensionsystem/extensionsystem.qbs
View File

@@ -9,7 +9,6 @@ QtcLibrary {
"IDE_TEST_DIR=\".\"" "IDE_TEST_DIR=\".\""
]) ])
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets"] } Depends { name: "Qt"; submodules: ["core", "widgets"] }
Depends { name: "Aggregation" } Depends { name: "Aggregation" }

1
src/libs/glsl/glsl.qbs
View File

@@ -9,7 +9,6 @@ QtcLibrary {
"GLSL_BUILD_LIB" "GLSL_BUILD_LIB"
]) ])
Depends { name: "cpp" }
Depends { name: "Qt.gui" } Depends { name: "Qt.gui" }
files: [ files: [

1
src/libs/languageutils/languageutils.qbs
View File

@@ -11,7 +11,6 @@ QtcLibrary {
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
files: [ files: [

1
src/libs/qmldebug/qmldebug.qbs
View File

@@ -6,7 +6,6 @@ QtcLibrary {
cpp.defines: base.concat("QMLDEBUG_LIB") cpp.defines: base.concat("QMLDEBUG_LIB")
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] } Depends { name: "Qt"; submodules: ["gui", "network"] }
files: [ files: [

1
src/libs/qmleditorwidgets/qmleditorwidgets.qbs
View File

@@ -12,7 +12,6 @@ QtcLibrary {
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] } Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "Utils" } Depends { name: "Utils" }

2
src/libs/qmljs/qmljs.qbs
View File

@@ -13,7 +13,6 @@ QtcLibrary {
Depends { name: "Utils" } Depends { name: "Utils" }
Depends { name: "LanguageUtils" } Depends { name: "LanguageUtils" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "script"] } Depends { name: "Qt"; submodules: ["widgets", "script"] }
files: [ files: [
@@ -108,7 +107,6 @@ QtcLibrary {
] ]
Export { Export {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" } Depends { name: "LanguageUtils" }
cpp.defines: [ cpp.defines: [
"QT_CREATOR" "QT_CREATOR"

1
src/libs/ssh/ssh.qbs
View File

@@ -8,7 +8,6 @@ QtcLibrary {
cpp.includePaths: botanIncludes cpp.includePaths: botanIncludes
cpp.dynamicLibraries: botanLibs cpp.dynamicLibraries: botanLibs
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network" ] } Depends { name: "Qt"; submodules: ["widgets", "network" ] }
files: [ files: [

1
src/libs/utils/process_ctrlc_stub.qbs
View File

@@ -6,7 +6,6 @@ QtcTool {
consoleApplication: true consoleApplication: true
condition: qbs.targetOS == "windows" condition: qbs.targetOS == "windows"
Depends { name: "cpp" }
files: [ "process_ctrlc_stub.cpp" ] files: [ "process_ctrlc_stub.cpp" ]

1
src/libs/utils/process_stub.qbs
View File

@@ -5,7 +5,6 @@ QtcTool {
name: "qtcreator_process_stub" name: "qtcreator_process_stub"
consoleApplication: true consoleApplication: true
Depends { name: "cpp" }
files: { files: {
if (qbs.targetOS == "windows") { if (qbs.targetOS == "windows") {

4
src/libs/utils/utils.qbs
View File

@@ -19,7 +19,6 @@ QtcLibrary {
cpp.dynamicLibraries: ["X11"] cpp.dynamicLibraries: ["X11"]
} }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] } Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
@@ -212,10 +211,7 @@ QtcLibrary {
} }
Export { Export {
// ### [ remove, once qbs supports merging of Export items in derived products
Depends { name: "cpp" }
cpp.includePaths: [ ".." ] cpp.includePaths: [ ".." ]
// ### ]
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] } Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
} }
} }

1
src/libs/zeroconf/zeroconf.qbs
View File

@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary { QtcLibrary {
name: "zeroconf" name: "zeroconf"
Depends { name: "cpp" }
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
cpp.includePaths: base.concat(".") cpp.includePaths: base.concat(".")

1
src/plugins/analyzerbase/analyzerbase.qbs
View File

@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "cpp" }
cpp.defines: base.concat("ANALYZER_LIBRARY") cpp.defines: base.concat("ANALYZER_LIBRARY")
files: [ files: [

1
src/plugins/bazaar/bazaar.qbs
View File

@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" } Depends { name: "VcsBase" }
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "cpp" }
files: [ files: [
"annotationhighlighter.cpp", "annotationhighlighter.cpp",

1
src/plugins/classview/classview.qbs
View File

@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "cpp" }
files: [ files: [
"classview.qrc", "classview.qrc",

1
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -252,7 +252,6 @@ QtcPlugin {
} }
Export { Export {
Depends { name: "cpp" }
Depends { name: "Aggregation" } Depends { name: "Aggregation" }
Depends { name: "Utils" } Depends { name: "Utils" }
} }

1
src/plugins/cpaster/cpaster.qbs
View File

@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../shared/cpaster") cpp.includePaths: base.concat("../../shared/cpaster")
files: [ files: [

1
src/plugins/cpaster/frontend/frontend.qbs
View File

@@ -4,7 +4,6 @@ import "../../../tools/QtcTool.qbs" as QtcTool
QtcTool { QtcTool {
name: "cpaster" name: "cpaster"
Depends { name: "cpp" }
Depends { Depends {
name: "Qt" name: "Qt"
submodules: ["gui", "network"] submodules: ["gui", "network"]

1
src/plugins/cppeditor/cppeditor.qbs
View File

@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../libs/3rdparty") cpp.includePaths: base.concat("../../libs/3rdparty")

1
src/plugins/debugger/debugger.qbs
View File

@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "QmlDebug" } Depends { name: "QmlDebug" }
Depends { name: "QtcSsh" } Depends { name: "QtcSsh" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"shared", "shared",
"lldb", "lldb",

1
src/plugins/debugger/ptracepreload.qbs
View File

@@ -10,7 +10,6 @@ QtcLibrary {
"c" "c"
] ]
Depends { name: "cpp" }
files: [ files: [
"ptracepreload.c", "ptracepreload.c",

1
src/plugins/designer/designer.qbs
View File

@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.defines: base.concat(["CPP_ENABLED"]) cpp.defines: base.concat(["CPP_ENABLED"])
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"../../libs/3rdparty", "../../libs/3rdparty",

1
src/plugins/diffeditor/diffeditor.qbs
View File

@@ -10,7 +10,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "Find" } Depends { name: "Find" }
Depends { name: "cpp" }
files: [ files: [
"diffeditorplugin.cpp", "diffeditorplugin.cpp",

1
src/plugins/find/find.qbs
View File

@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"generichighlighter", "generichighlighter",

1
src/plugins/help/help.qbs
View File

@@ -20,7 +20,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
Depends { name: "cpp" }
cpp.defines: { cpp.defines: {
var list = base; var list = base;

1
src/plugins/locator/locator.qbs
View File

@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"generichighlighter", "generichighlighter",

1
src/plugins/projectexplorer/projectexplorer.qbs
View File

@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "QtcSsh" } Depends { name: "QtcSsh" }
Depends { name: "cpp" }
cpp.defines: base.concat("QTC_CPU=X86Architecture") cpp.defines: base.concat("QTC_CPU=X86Architecture")
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"customwizard", "customwizard",

1
src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
View File

@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" } Depends { name: "QmlJSTools" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
qbs_source_dir + "/src", qbs_source_dir + "/src",

1
src/plugins/qmldesigner/qmldesigner.qbs
View File

@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "LanguageUtils" } Depends { name: "LanguageUtils" }
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
Depends { name: "cpp" }
cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"]) cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"designercore", "designercore",

1
src/plugins/qmljseditor/qmljseditor.qbs
View File

@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "QmlEditorWidgets" } Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
cpp.defines: base.concat("QT_CREATOR") cpp.defines: base.concat("QT_CREATOR")
files: [ files: [

1
src/plugins/qmljstools/qmljstools.qbs
View File

@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "QmlDebug" } Depends { name: "QmlDebug" }
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../libs/3rdparty") cpp.includePaths: base.concat("../../libs/3rdparty")
files: [ files: [

1
src/plugins/qmlprofiler/qmlprofiler.qbs
View File

@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QmlJSTools" } Depends { name: "QmlJSTools" }
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("canvas") cpp.includePaths: base.concat("canvas")
files: [ files: [

1
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
View File

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "QmlProjectManager" name: "QmlProjectManager"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "declarative"] } Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }

1
src/plugins/qt4projectmanager/qt4projectmanager.qbs
View File

@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "QmlJSTools" } Depends { name: "QmlJSTools" }
Depends { name: "cpp" }
cpp.defines: base.concat([ cpp.defines: base.concat([
"PROPARSER_AS_LIBRARY", "PROPARSER_AS_LIBRARY",
"PROPARSER_THREAD_SAFE", "PROPARSER_THREAD_SAFE",

1
src/plugins/qtsupport/qtsupport.qbs
View File

@@ -11,7 +11,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([ cpp.includePaths: base.concat([
"../../shared", "../../shared",
"../../shared/proparser" "../../shared/proparser"

1
src/plugins/remotelinux/remotelinux.qbs
View File

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "RemoteLinux" name: "RemoteLinux"
Depends { name: "cpp" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "Debugger" } Depends { name: "Debugger" }

1
src/plugins/resourceeditor/resourceeditor.qbs
View File

@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "Find" } Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "xml"] } Depends { name: "Qt"; submodules: ["widgets", "xml"] }
cpp.includePaths: base.concat("qrceditor") cpp.includePaths: base.concat("qrceditor")

1
src/plugins/updateinfo/updateinfo.qbs
View File

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "UpdateInfo" name: "UpdateInfo"
Depends { name: "cpp" }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }

1
src/plugins/vcsbase/vcsbase.qbs
View File

@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "Find" } Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "CppTools" } Depends { name: "CppTools" }
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }

1
src/plugins/welcome/welcome.qbs
View File

@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../shared/scriptwrapper") cpp.includePaths: base.concat("../../shared/scriptwrapper")
files: [ files: [

1
src/tools/qtcdebugger/qtcdebugger.qbs
View File

@@ -14,7 +14,6 @@ QtcTool {
"advapi32" "advapi32"
] ]
Depends { name: "cpp" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }

1
src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
View File

@@ -10,7 +10,6 @@ QtcTool {
"../../libs" "../../libs"
] ]
Depends { name: "cpp" }
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }

1
src/tools/qtpromaker/qtpromaker.qbs
View File

@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
QtcTool { QtcTool {
name: "qtpromaker" name: "qtpromaker"
Depends { name: "cpp" }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
files: [ "main.cpp" ] files: [ "main.cpp" ]

1
src/tools/sdktool/sdktool.qbs
View File

@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
QtcTool { QtcTool {
name: "sdktool" name: "sdktool"
Depends { name: "cpp" }
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
Depends { name: "Utils" } Depends { name: "Utils" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }