diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:37:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:47:42 +0200 |
| commit | aedc59b1c38528f96f0e0cc51bf6c9eeca9dca28 (patch) | |
| tree | 80e38cea91c93736a7d4436642dd46c8b2dd6386 /configure.json | |
| parent | e3b3dbbe93dbbac196543f62b444b2c044d14907 (diff) | |
| parent | f6db25962e820d7709c2f235f02893dd3edde4f4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/network/ssl/qsslsocket_openssl.cpp
Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 5ee4faf1a3..9c9515bb52 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" }, |