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

Fix qbs warnings

Browse Source 
Duplicate dependencies

Change-Id: I23e931cd6e75494a8ec7e099b0f2549764e5924b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Orgad Shaneh
2013-09-27 00:24:32 +03:00
committed by Joerg Bornemann
parent f8799a5583
commit 666bdaa9b7
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ QtcPlugin {
Depends { Depends {
name: "Qt" name: "Qt"
submodules: [ submodules: [
"core", "widgets", "xml", "network", "script", "sql", "help", "printsupport" "widgets", "xml", "network", "script", "sql", "help", "printsupport"
] ]
} }
Depends { name: "Utils" } Depends { name: "Utils" }

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

@@ -263,7 +263,6 @@ QtcPlugin {
} }
Export { Export {
Depends { name: "cpp" }
Depends { name: "QtcSsh" } Depends { name: "QtcSsh" }
} }
} }

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

@@ -6,7 +6,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "ProjectExplorer" name: "ProjectExplorer"
Depends { name: "Qt"; submodules: ["core", "widgets", "xml", "network", "script"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); } Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "Locator" } Depends { name: "Locator" }

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

@@ -6,7 +6,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "QtSupport" name: "QtSupport"
Depends { name: "Qt"; submodules: ["core", "widgets"]; } Depends { name: "Qt"; submodules: ["widgets"]; }
Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); } Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
@@ -123,7 +123,6 @@ QtcPlugin {
Export { Export {
Depends { name: "cpp" }
cpp.includePaths: "../../shared" cpp.includePaths: "../../shared"
cpp.defines: [ cpp.defines: [
"QMAKE_AS_LIBRARY", "QMAKE_AS_LIBRARY",