diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:12:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-07 13:19:27 +0200 |
| commit | 9967a011eaae8988b10e56fde0f2ab8b6bab90ac (patch) | |
| tree | 353b932414a8d9d94a418e84068550b0a2376b37 /configure.json | |
| parent | 91ab70d17f892f3ff6b2019632fda3920d045dcb (diff) | |
| parent | 99636127d10f96d8313bc26030cabf9841381914 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
qmake/generators/makefile.cpp
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoaintegration.mm
Done-With: Jörg Bornemann <joerg.bornemann@qt.io>
Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 7f3018ed23..5ee4faf1a3 100644 --- a/configure.json +++ b/configure.json @@ -704,6 +704,7 @@ }, "optimize_debug": { "label": "Optimize debug build", + "autoDetect": "!features.developer-build", "condition": "!config.msvc && !config.clang && (features.debug || features.debug_and_release) && tests.optimize_debug", "output": [ "privateConfig" ] }, |