diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-18 17:02:20 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-18 17:10:55 +0200 |
| commit | 0834958063edf149b7a25326b342100272daff3c (patch) | |
| tree | eb7485099a643f9c97e0a1896d893fd3a0fa8c8a /src/plugins | |
| parent | d6d8e2639ed34d87c1772e85e8c14c47aeabd532 (diff) | |
| download | qt-creator-0834958063edf149b7a25326b342100272daff3c.tar.gz | |
qbs files updated
Property bindings in ProductModules now need explicit Depends items.
Also, some Qt dependencies were propagated wrongly and are now
added explicitely.
Change-Id: I58cd389eb0ab106004b1d575438d1ad2ff36189f
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/analyzerbase/analyzerbase.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/coreplugin/coreplugin.qbs | 3 | ||||
| -rw-r--r-- | src/plugins/debugger/debugger.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/qmljsinspector/qmljsinspector.qbs | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs index 9ca081487e..3ecce0612a 100644 --- a/src/plugins/analyzerbase/analyzerbase.qbs +++ b/src/plugins/analyzerbase/analyzerbase.qbs @@ -54,6 +54,7 @@ QtcPlugin { ] ProductModule { + Depends { name: "cpp" } cpp.includePaths: [ "." ] diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 53dde48347..46f396fbcd 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -241,13 +241,14 @@ QtcPlugin { } ProductModule { + Depends { name: "cpp" } Depends { name: "Aggregation" } Depends { name: "ExtensionSystem" } Depends { name: "Utils" } cpp.includePaths: [ "../..", "../../libs", - buildDirectory + "/.obj/Core/actionmanager" + product.buildDirectory + "/.obj/Core/actionmanager" ] } } diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 4cf39f71e4..47a2a27202 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -305,6 +305,7 @@ QtcPlugin { } ProductModule { + Depends { name: "cpp" } cpp.includePaths: ["."] } } diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 320aac6de8..da5e7bbeb6 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "QmlJSEditor" - Depends { name: "qt"; submodules: ['gui'] } + Depends { name: "qt"; submodules: ['widgets', 'script'] } Depends { name: "Core" } Depends { name: "TextEditor" } Depends { name: "ProjectExplorer" } diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs index f76b02cc95..441d539301 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.qbs +++ b/src/plugins/qmljsinspector/qmljsinspector.qbs @@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "QmlJSInspector" - Depends { name: "qt"; submodules: ['gui'] } + Depends { name: "qt"; submodules: ['widgets', 'quick1'] } Depends { name: "Core" } Depends { name: "ProjectExplorer" } Depends { name: "QmlProjectManager" } |