diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
| commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
| tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /configure.json | |
| parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
| parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) | |
| download | qtbase-4dac45c9ee59ff6586d90d423654da91523ab679.tar.gz | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 069eb07ec7..33e429338b 100644 --- a/configure.json +++ b/configure.json @@ -82,7 +82,7 @@ "force-pkg-config": { "type": "void", "name": "pkg-config" }, "framework": "boolean", "gc-binaries": { "type": "boolean", "name": "gc_binaries" }, - "gdb-index": { "type": "boolean", "name": "gdb_index" }, + "gdb-index": { "type": "boolean", "name": "enable_gdb_index" }, "gcc-sysroot": "boolean", "gcov": "boolean", "gnumake": { "type": "boolean", "name": "GNUmake" }, @@ -705,6 +705,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" ] }, |