diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-16 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-16 11:20:42 +0100 |
| commit | 0a4e5bb265c4a2345a9cbffab1b5150124b8d31e (patch) | |
| tree | b243668d53f710af3d57a44c18e1ed0c40b100f7 /configure.json | |
| parent | 4772a2da15ae0624633f3fc4d029d5f0e1e33892 (diff) | |
| parent | bd828bacb982a51ee21f03487f8390cfc96cc6d3 (diff) | |
| download | qtbase-0a4e5bb265c4a2345a9cbffab1b5150124b8d31e.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/widgets/kernel/qshortcut.cpp
tests/auto/network/access/spdy/tst_spdy.cpp
Change-Id: If76c434beac2c0a393440aa365f89f77439774ce
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.json b/configure.json index d94dea850b..8bf9cd5c9f 100644 --- a/configure.json +++ b/configure.json @@ -1484,6 +1484,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 { "type": "emccVersion", "condition": "config.wasm" + }, + { + "type": "error", + "condition": "config.ios && features.debug && !features.debug_and_release", + "message": "Debug build wihtout Release build is not currently supported on ios see QTBUG-71990. Use -debug-and-release." } ], |