Commit 527594bb authored by Christian Kandeler's avatar Christian Kandeler

qbs build: Add missing defines

The string concatenation macros were not set, as opposed to the qmake
build.

Change-Id: I32e2c72c891419ef8352cb7b46e3b7f9b82b6312
Reviewed-by: Jake Petroules's avatarJake Petroules <jake.petroules@qt.io>
parent 668c87ff
......@@ -15,7 +15,11 @@ QtcProduct {
project.buildDirectory + '/' + qtc.ide_library_path,
project.buildDirectory + '/' + qtc.ide_plugin_path
]
cpp.defines: base.filter(function(d) { return d != "QT_RESTRICTED_CAST_FROM_ASCII"; })
cpp.defines: base.filter(function(d) {
return d !== "QT_RESTRICTED_CAST_FROM_ASCII"
&& d !== "QT_USE_FAST_OPERATOR_PLUS"
&& d !== "QT_USE_FAST_CONCATENATION";
})
Group {
fileTagsFilter: product.type
......
......@@ -76,6 +76,8 @@ Module {
"QT_NO_CAST_TO_ASCII",
"QT_RESTRICTED_CAST_FROM_ASCII",
"QT_DISABLE_DEPRECATED_BEFORE=0x050600",
"QT_USE_FAST_OPERATOR_PLUS",
"QT_USE_FAST_CONCATENATION",
].concat(testsEnabled ? ["WITH_TESTS"] : [])
Rule {
......
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