diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:39:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:46:20 +0100 |
| commit | 246799d8a7bf42c1f22fca7ef6d77e8d58054bad (patch) | |
| tree | a0b92a804d7d2a30cd68fa327df5777d8bcc36ba /configure.json | |
| parent | 5ad191850becd7dc1d61d0975f141a5db64e6373 (diff) | |
| parent | 02cc57f4edbae450ecfa8368052afa44f8aeee19 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
examples/network/network-chat/peermanager.cpp
src/widgets/util/qsystemtrayicon.cpp
src/widgets/util/qsystemtrayicon_qpa.cpp
src/widgets/util/qsystemtrayicon_win.cpp
src/widgets/util/qsystemtrayicon_x11.cpp
Change-Id: I1c026df83818c0ccaf956980370e7522960627db
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/configure.json b/configure.json index c293fbb676..21ec84818d 100644 --- a/configure.json +++ b/configure.json @@ -109,7 +109,6 @@ "reduce-relocations": { "type": "boolean", "name": "reduce_relocations" }, "release": { "type": "enum", "name": "debug", "values": { "yes": "no", "no": "yes" } }, "rpath": "boolean", - "rtti": "boolean", "sanitize": "sanitize", "sdk": "string", "separate-debug-info": { "type": "boolean", "name": "separate_debug_info" }, @@ -573,12 +572,6 @@ "autoDetect": false, "output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ] }, - "rtti": { - "label": "Build with RTTI", - "comment": "mkspecs/features/win32/default_pre.prf sets no-rtti. Follow default behavior of configure.exe by overriding with rtti.", - "condition": "config.win32", - "output": [ "publicConfig" ] - }, "force_asserts": { "label": "Force assertions", "autoDetect": false, |