diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-07-02 12:38:35 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-07-07 05:10:49 +0000 |
| commit | 60fb78733d6218457804ba6e9860e7a25b41e166 (patch) | |
| tree | 0965c63464e67970221ab28e6efe305b8ea2e22c /src | |
| parent | 397d576fdeeb6b5982562ba8524b2fe09836c0e4 (diff) | |
Avoid unwanted defines when building bundled QtScript
When building Qbs there might be project defines present that
make the compile fail.
Drop these defines if present.
Change-Id: I24532efca94560a21690f3016282a8f9420abe54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/scriptengine/scriptengine.qbs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs index 4c03d5e36..88263845f 100644 --- a/src/lib/scriptengine/scriptengine.qbs +++ b/src/lib/scriptengine/scriptengine.qbs @@ -90,6 +90,12 @@ Project { result.push("WTF_USE_ACCELERATED_COMPOSITING"); if (useSystemMalloc) result.push("USE_SYSTEM_MALLOC"); + + result = result.filter(function(value) { + return value !== "QT_RESTRICTED_CAST_FROM_ASCII" + && value !== "QT_NO_CAST_FROM_BYTEARRAY" + && value !== "QT_NO_CAST_FROM_ASCII"; + }) return result; } cpp.cxxFlags: { |