diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-07 18:19:51 +0000 |
| commit | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (patch) | |
| tree | 65241f1258136d0c45bcaa3b51e1393a2f595e6a /configure.json | |
| parent | 2145cdc54d5812793310f7e3b3709bfa2648bd50 (diff) | |
| parent | 4e7af2061e8c323b2a21f0549643a2cfab191664 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/configure.json b/configure.json index 8bf9cd5c9f..1699f69ca4 100644 --- a/configure.json +++ b/configure.json @@ -898,7 +898,7 @@ "label": "Fuzzer (instrumentation only)", "autoDetect": false, "output": [ "publicConfig" ], - "purpose": [ "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's." ] + "purpose": "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's." }, "sanitize_undefined": { "label": "Undefined", @@ -1426,9 +1426,7 @@ { "type": "warning", "condition": "input.debug_and_release == 'yes' && !config.darwin && !config.win32", - "message": "-debug-and-release is only supported on Darwin and Windows platforms. -Qt can be built in release mode with separate debug information, so --debug-and-release is no longer necessary." + "message": "-debug-and-release is only supported on Darwin and Windows platforms. Qt can be built in release mode with separate debug information, so -debug-and-release is no longer necessary." }, { "type": "error", @@ -1461,9 +1459,7 @@ Qt can be built in release mode with separate debug information, so { "type": "note", "condition": "!features.shared", - "message": "Using static linking will disable the use of dynamically -loaded plugins. Make sure to import all needed static plugins, -or compile needed modules into the library." + "message": "Using static linking will disable the use of dynamically loaded plugins. Make sure to import all needed static plugins, or compile needed modules into the library." }, { "type": "note", @@ -1473,8 +1469,7 @@ or compile needed modules into the library." { "type": "note", "condition": "input.qreal == 'double' && arch.arm", - "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1. -Configure with '-qreal float' to create a build that is binary-compatible with 5.1." + "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1. Configure with '-qreal float' to create a build that is binary-compatible with 5.1." }, { "type": "error", |