diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs index ad8b0609f1e227ed455549985d543c269c48f929..ffa12c242b2632885b917d8ce4bb187a5a60ffcd 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 d97e483651a977dd33e701f96846c91254498e2b..aa939c512ac9e745ad725085a688f01260e42044 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 2484bedc9960b1ba65de091d1a1ce18c09300620..a8f0874b5ee2915a5432dce3d7b88b8de14a9f30 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 {