Commit 24e81241 authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann

Remove duplicate module dependencies from qbs files.

These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 97952cfd
......@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "Aggregation"
Depends { name: "cpp" }
Depends { name: "Qt.core" }
cpp.defines: base.concat("AGGREGATION_LIBRARY")
......
......@@ -11,7 +11,6 @@ QtcLibrary {
])
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Group {
......@@ -169,7 +168,6 @@ QtcLibrary {
]
Export {
Depends { name: "cpp" }
cpp.includePaths: [
".",
"../3rdparty",
......
......@@ -9,7 +9,6 @@ QtcLibrary {
"IDE_TEST_DIR=\".\""
])
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets"] }
Depends { name: "Aggregation" }
......
......@@ -9,7 +9,6 @@ QtcLibrary {
"GLSL_BUILD_LIB"
])
Depends { name: "cpp" }
Depends { name: "Qt.gui" }
files: [
......
......@@ -11,7 +11,6 @@ QtcLibrary {
])
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt.core" }
files: [
......
......@@ -6,7 +6,6 @@ QtcLibrary {
cpp.defines: base.concat("QMLDEBUG_LIB")
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] }
files: [
......
......@@ -12,7 +12,6 @@ QtcLibrary {
])
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
......
......@@ -13,7 +13,6 @@ QtcLibrary {
Depends { name: "Utils" }
Depends { name: "LanguageUtils" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "script"] }
files: [
......@@ -108,7 +107,6 @@ QtcLibrary {
]
Export {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" }
cpp.defines: [
"QT_CREATOR"
......
......@@ -8,7 +8,6 @@ QtcLibrary {
cpp.includePaths: botanIncludes
cpp.dynamicLibraries: botanLibs
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network" ] }
files: [
......
......@@ -6,7 +6,6 @@ QtcTool {
consoleApplication: true
condition: qbs.targetOS == "windows"
Depends { name: "cpp" }
files: [ "process_ctrlc_stub.cpp" ]
......
......@@ -5,7 +5,6 @@ QtcTool {
name: "qtcreator_process_stub"
consoleApplication: true
Depends { name: "cpp" }
files: {
if (qbs.targetOS == "windows") {
......
......@@ -19,7 +19,6 @@ QtcLibrary {
cpp.dynamicLibraries: ["X11"]
}
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] }
Depends { name: "app_version_header" }
......@@ -212,10 +211,7 @@ QtcLibrary {
}
Export {
// ### [ remove, once qbs supports merging of Export items in derived products
Depends { name: "cpp" }
cpp.includePaths: [ ".." ]
// ### ]
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
}
}
......
......@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "zeroconf"
Depends { name: "cpp" }
Depends { name: "Qt.network" }
cpp.includePaths: base.concat(".")
......
......@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
cpp.defines: base.concat("ANALYZER_LIBRARY")
files: [
......
......@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
files: [
"annotationhighlighter.cpp",
......
......@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
files: [
"classview.qrc",
......
......@@ -252,7 +252,6 @@ QtcPlugin {
}
Export {
Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
}
......
......@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../shared/cpaster")
files: [
......
......@@ -4,7 +4,6 @@ import "../../../tools/QtcTool.qbs" as QtcTool
QtcTool {
name: "cpaster"
Depends { name: "cpp" }
Depends {
name: "Qt"
submodules: ["gui", "network"]
......
......@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../libs/3rdparty")
......
......@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "QmlDebug" }
Depends { name: "QtcSsh" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([
"shared",
"lldb",
......
......@@ -10,7 +10,6 @@ QtcLibrary {
"c"
]
Depends { name: "cpp" }
files: [
"ptracepreload.c",
......
......@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.defines: base.concat(["CPP_ENABLED"])
cpp.includePaths: base.concat([
"../../libs/3rdparty",
......
......@@ -10,7 +10,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "Find" }
Depends { name: "cpp" }
files: [
"diffeditorplugin.cpp",
......
......@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Core" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([
"generichighlighter",
......
......@@ -20,7 +20,6 @@ QtcPlugin {
Depends { name: "Locator" }
Depends { name: "app_version_header" }
Depends { name: "cpp" }
cpp.defines: {
var list = base;
......
......@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Core" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([
"generichighlighter",
......
......@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "QtcSsh" }
Depends { name: "cpp" }
cpp.defines: base.concat("QTC_CPU=X86Architecture")
cpp.includePaths: base.concat([
"customwizard",
......
......@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([
qbs_source_dir + "/src",
......
......@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "LanguageUtils" }
Depends { name: "QtSupport" }
Depends { name: "cpp" }
cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
cpp.includePaths: base.concat([
"designercore",
......
......@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
cpp.defines: base.concat("QT_CREATOR")
files: [
......
......@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "QmlDebug" }
Depends { name: "QtSupport" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../libs/3rdparty")
files: [
......
......@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QmlJSTools" }
Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("canvas")
files: [
......
......@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProjectManager"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
......
......@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "QmlJSTools" }
Depends { name: "cpp" }
cpp.defines: base.concat([
"PROPARSER_AS_LIBRARY",
"PROPARSER_THREAD_SAFE",
......
......@@ -11,7 +11,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "QmlJS" }
Depends { name: "cpp" }
cpp.includePaths: base.concat([
"../../shared",
"../../shared/proparser"
......
......@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "RemoteLinux"
Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "Core" }
Depends { name: "Debugger" }
......
......@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "xml"] }
cpp.includePaths: base.concat("qrceditor")
......
......@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "UpdateInfo"
Depends { name: "cpp" }
Depends { name: "Core" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
......
......@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
......
......@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.includePaths: base.concat("../../shared/scriptwrapper")
files: [
......
......@@ -14,7 +14,6 @@ QtcTool {
"advapi32"
]
Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "app_version_header" }
......
......@@ -10,7 +10,6 @@ QtcTool {
"../../libs"
]
Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "app_version_header" }
......
......@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
QtcTool {
name: "qtpromaker"
Depends { name: "cpp" }
Depends { name: "Qt.core" }
files: [ "main.cpp" ]
......
......@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
QtcTool {
name: "sdktool"
Depends { name: "cpp" }
Depends { name: "Qt.core" }
Depends { name: "Utils" }
Depends { name: "app_version_header" }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment