diff --git a/config_help.txt b/config_help.txt index f711a01cb8..5ebeaf5af3 100644 --- a/config_help.txt +++ b/config_help.txt @@ -99,7 +99,6 @@ Build options: -c++std .... Select C++ standard [c++1z/c++14/c++11] (Not supported with MSVC) - -rtti ................ Build with Runtime Type Information [yes] (MSVC only) -sse2 ................ Use SSE2 instructions [auto] -sse3/-ssse3/-sse4.1/-sse4.2/-avx/-avx2/-avx512 diff --git a/configure.json b/configure.json index f9abdae8ca..7d04f0a516 100644 --- a/configure.json +++ b/configure.json @@ -107,7 +107,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" }, @@ -554,12 +553,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, diff --git a/mkspecs/features/win32/default_pre.prf b/mkspecs/features/win32/default_pre.prf index bdb72c0d89..a9b247e113 100644 --- a/mkspecs/features/win32/default_pre.prf +++ b/mkspecs/features/win32/default_pre.prf @@ -1,2 +1,2 @@ -CONFIG = rtti_off incremental_off windows $$CONFIG +CONFIG = incremental_off windows $$CONFIG load(default_pre)