From 666bdaa9b74e473f11a2faf33f521cf0981a473d Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 27 Sep 2013 00:24:32 +0300 Subject: [PATCH] Fix qbs warnings Duplicate dependencies Change-Id: I23e931cd6e75494a8ec7e099b0f2549764e5924b Reviewed-by: Joerg Bornemann --- src/plugins/coreplugin/coreplugin.qbs | 2 +- src/plugins/debugger/debugger.qbs | 1 - src/plugins/projectexplorer/projectexplorer.qbs | 2 +- src/plugins/qtsupport/qtsupport.qbs | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 3edb01e82ef..16b8c5cb783 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -7,7 +7,7 @@ QtcPlugin { Depends { name: "Qt" submodules: [ - "core", "widgets", "xml", "network", "script", "sql", "help", "printsupport" + "widgets", "xml", "network", "script", "sql", "help", "printsupport" ] } Depends { name: "Utils" } diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 3ebb7c45cac..5666ea467f4 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -263,7 +263,6 @@ QtcPlugin { } Export { - Depends { name: "cpp" } Depends { name: "QtcSsh" } } } diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 3fd7a478556..18ff08a8eaa 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -6,7 +6,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { 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: "Core" } Depends { name: "Locator" } diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index e1ea0710ab1..d6142bdcfc2 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -6,7 +6,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { 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: "Core" } Depends { name: "ProjectExplorer" } @@ -123,7 +123,6 @@ QtcPlugin { Export { - Depends { name: "cpp" } cpp.includePaths: "../../shared" cpp.defines: [ "QMAKE_AS_LIBRARY",