From 27d3c14ab6e8865d39f85792eb26c39b76ddf102 Mon Sep 17 00:00:00 2001 From: Daniel Wingerd Date: Wed, 12 Dec 2018 14:36:49 -0500 Subject: [PATCH] qmake: enable rtti config option for g++/clang Fixes: QTBUG-26595 Change-Id: Ic996c8e27ef4b79c91c5afa0ad55ef0fc07b6004 Reviewed-by: Oswald Buddenhagen --- mkspecs/common/g++-win32.conf | 2 -- mkspecs/common/gcc-base.conf | 2 ++ mkspecs/features/{win32 => }/rtti.prf | 0 mkspecs/features/{win32 => }/rtti_off.prf | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename mkspecs/features/{win32 => }/rtti.prf (100%) rename mkspecs/features/{win32 => }/rtti_off.prf (100%) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf index f0df324b644..c3a1f3a3732 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -31,8 +31,6 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS_SSE2 += -mstackrealign -QMAKE_CXXFLAGS_RTTI_ON = -frtti -QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads QMAKE_INCDIR = diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index c2669e48336..44b42672079 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -68,6 +68,8 @@ QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_CXXFLAGS_EXCEPTIONS_OFF += $$QMAKE_CFLAGS_EXCEPTIONS_OFF +QMAKE_CXXFLAGS_RTTI_ON = -frtti +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_SPLIT_SECTIONS += $$QMAKE_CFLAGS_SPLIT_SECTIONS QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS diff --git a/mkspecs/features/win32/rtti.prf b/mkspecs/features/rtti.prf similarity index 100% rename from mkspecs/features/win32/rtti.prf rename to mkspecs/features/rtti.prf diff --git a/mkspecs/features/win32/rtti_off.prf b/mkspecs/features/rtti_off.prf similarity index 100% rename from mkspecs/features/win32/rtti_off.prf rename to mkspecs/features/rtti_off.prf