Commit 08349580 authored by Joerg Bornemann's avatar Joerg Bornemann

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: default avatarMarco Bubke <marco.bubke@nokia.com>
parent d6d8e263
......@@ -543,6 +543,7 @@ QtcLibrary {
}
ProductModule {
Depends { name: "cpp" }
cpp.linkerFlags: {
if (qbs.toolchain === 'mingw') {
return ['--enable-auto-import']
......
......@@ -177,6 +177,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [
".",
"../3rdparty",
......
......@@ -28,6 +28,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
......
......@@ -60,6 +60,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
......
......@@ -103,6 +103,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [
".",
"parser"
......
......@@ -41,6 +41,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
Depends { name: "symbianutils" }
cpp.includePaths: [
"."
......
......@@ -55,6 +55,7 @@ QtcLibrary {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [
"../../shared/symbianutils",
"../../shared/json",
......
......@@ -242,5 +242,9 @@ QtcLibrary {
"unixutils.cpp"
]
}
ProductModule {
Depends { name: "Qt"; submodules: ["widgets", "network"] }
}
}
......@@ -34,5 +34,8 @@ QtcLibrary {
"syssocket.h"
]
ProductModule { cpp.includePaths: "." }
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: "."
}
}
......@@ -54,6 +54,7 @@ QtcPlugin {
]
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [
"."
]
......
......@@ -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"
]
}
}
......
......@@ -305,6 +305,7 @@ QtcPlugin {
}
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
......
......@@ -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" }
......
......@@ -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" }
......
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