Commit 06aa0363 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Joerg Bornemann

Qbs: Libraries capitalized and relocated in bin on Windows

Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: default avatarMarco Bubke <marco.bubke@nokia.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@nokia.com>
parent 791a196f
...@@ -136,8 +136,8 @@ Project { ...@@ -136,8 +136,8 @@ Project {
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] } Depends { name: "Qt"; submodules: ["gui", "network"] }
Depends { name: "utils" } Depends { name: "Utils" }
Depends { name: "extensionsystem" } Depends { name: "ExtensionSystem" }
files: [ files: [
"src/app/main.cpp", "src/app/main.cpp",
......
import qbs.base 1.0 import qbs.base 1.0
import "../../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "botan" name: "Botan"
destination: "lib"
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "qt"; submodules: 'core' } Depends { name: "qt"; submodules: 'core' }
......
import qbs.base 1.0
DynamicLibrary {
destination: {
if (qbs.targetOS === "windows")
return "bin"
else
return "lib"
}
}
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "aggregation" name: "Aggregation"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "CPlusPlus" name: "CPlusPlus"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "extensionsystem" name: "ExtensionSystem"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
...@@ -15,7 +15,7 @@ DynamicLibrary { ...@@ -15,7 +15,7 @@ DynamicLibrary {
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "gui"] } Depends { name: "Qt"; submodules: ["core", "gui"] }
Depends { name: "aggregation" } Depends { name: "Aggregation" }
files: [ files: [
"plugindetailsview.ui", "plugindetailsview.ui",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "GLSL" name: "GLSL"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "LanguageUtils" name: "LanguageUtils"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "QmlEditorWidgets" name: "QmlEditorWidgets"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "QmlJS" name: "QmlJS"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
...@@ -15,8 +15,8 @@ DynamicLibrary { ...@@ -15,8 +15,8 @@ DynamicLibrary {
] ]
cpp.optimization: "fast" cpp.optimization: "fast"
Depends { name: "utils" } Depends { name: "Utils" }
Depends { name: "languageutils" } Depends { name: "LanguageUtils" }
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ['gui', 'script'] } Depends { name: "Qt"; submodules: ['gui', 'script'] }
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "QmlJSDebugClient" name: "QmlJSDebugClient"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "symbianutils" name: "symbianutils"
destination: "lib"
cpp.includePaths: [ cpp.includePaths: [
".", ".",
...@@ -19,7 +19,7 @@ DynamicLibrary { ...@@ -19,7 +19,7 @@ DynamicLibrary {
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["network"]} Depends { name: "Qt"; submodules: ["network"]}
Depends { name: "utils" } Depends { name: "Utils" }
Group { Group {
condition: qbs.targetOS == "linux" || qbs.targetOS == "mac" condition: qbs.targetOS == "linux" || qbs.targetOS == "mac"
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "utils" name: "Utils"
destination: "lib"
cpp.defines: [ "QTCREATOR_UTILS_LIB" ] cpp.defines: [ "QTCREATOR_UTILS_LIB" ]
cpp.includePaths: [ ".", "..", cpp.includePaths: [ ".", "..",
...@@ -19,7 +19,7 @@ DynamicLibrary { ...@@ -19,7 +19,7 @@ DynamicLibrary {
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ['gui', 'network', 'script'] } Depends { name: "Qt"; submodules: ['gui', 'network', 'script'] }
Depends { name: "botan" } Depends { name: "Botan" }
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
files: [ files: [
......
import qbs.base 1.0 import qbs.base 1.0
import "../QtcLibrary.qbs" as QtcLibrary
DynamicLibrary { QtcLibrary {
name: "zeroconf" name: "zeroconf"
destination: "lib"
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
......
...@@ -5,10 +5,9 @@ QtcPlugin { ...@@ -5,10 +5,9 @@ QtcPlugin {
name: "Core" name: "Core"
Depends { name: "qt"; submodules: ['core', 'gui', 'xml', 'network', 'script', 'sql', 'help'] } Depends { name: "qt"; submodules: ['core', 'gui', 'xml', 'network', 'script', 'sql', 'help'] }
Depends { name: "utils" } Depends { name: "Utils" }
Depends { name: "extensionsystem" } Depends { name: "ExtensionSystem" }
Depends { name: "aggregation" } Depends { name: "Aggregation" }
Depends { name: "pluginspec" }
cpp.includePaths: [ cpp.includePaths: [
".", ".",
...@@ -242,9 +241,9 @@ QtcPlugin { ...@@ -242,9 +241,9 @@ QtcPlugin {
} }
ProductModule { ProductModule {
Depends { name: "aggregation" } Depends { name: "Aggregation" }
Depends { name: "extensionsystem" } Depends { name: "ExtensionSystem" }
Depends { name: "utils" } Depends { name: "Utils" }
cpp.includePaths: [ cpp.includePaths: [
"../..", "../..",
"../../libs", "../../libs",
......
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