diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 12:57:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-30 12:57:22 +0000 |
| commit | c35342ffeba10deecb2d8c0ce30a3a1a4ec1ee8d (patch) | |
| tree | 0b7782b3d8973d20ee4db36f768367b94e3d3394 /configure.json | |
| parent | 7200572b393534a2f503b810180276d2ae809c7a (diff) | |
| parent | 87204c856ae3d8495c41af998ac196a12fe1c779 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 1268fc87a2..a0b9765d18 100644 --- a/configure.json +++ b/configure.json @@ -585,7 +585,7 @@ }, "optimize_debug": { "label": "Optimize debug build", - "condition": "!config.msvc && (features.debug || features.debug_and_release) && tests.optimize_debug", + "condition": "!config.msvc && !config.clang && (features.debug || features.debug_and_release) && tests.optimize_debug", "output": [ "privateConfig" ] }, "optimize_size": { @@ -1234,7 +1234,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 { "type": "feature", "args": "optimize_debug", - "condition": "!config.msvc && (features.debug || features.debug_and_release)" + "condition": "!config.msvc && !config.clang && (features.debug || features.debug_and_release)" }, { "type": "feature", |