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

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")
......
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