From 65d151ce5eab5ccfecb39483780c32a5dfe15ff6 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Mon, 5 Mar 2012 14:05:32 +0100
Subject: [PATCH] qbs files updated
Change-Id: I6200e52487e614b905fdb0676bfaf67fd0ea55b9
Reviewed-by: hjk <qthjk@ovi.com>
---
src/libs/symbianutils/symbianutils.qbs | 2 ++
src/libs/utils/utils.qbs | 2 +-
src/plugins/QtcPlugin.qbs | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
index ad8b0609f1e..ffa12c242b2 100644
--- a/src/libs/symbianutils/symbianutils.qbs
+++ b/src/libs/symbianutils/symbianutils.qbs
@@ -12,6 +12,8 @@ DynamicLibrary {
]
cpp.defines: [
"SYMBIANUTILS_BUILD_LIB",
+ "JSON_BUILD_LIB",
+ "JSON_INCLUDE_PRI",
"HAS_SERIALPORT"
]
cpp.optimization: "fast"
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index d97e483651a..aa939c512ac 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -4,7 +4,7 @@ DynamicLibrary {
name: "utils"
destination: "lib"
- cpp.defines: [ "QTCREATOR_UTILS_LIB" ]
+ cpp.defines: base.concat(["QTCREATOR_UTILS_LIB"])
cpp.includePaths: [ ".", "..",
"../..",
"../3rdparty/botan/build",
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 2484bedc996..a8f0874b5ee 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -7,7 +7,7 @@ Product {
Depends { name: "pluginspec" }
Depends { name: 'cpp' }
- cpp.defines: [ name.toUpperCase() + "_LIBRARY" ]
+ cpp.defines: base.concat([ name.toUpperCase() + "_LIBRARY" ])
cpp.rpaths: ["$ORIGIN/../../.."]
Group {
--
GitLab