Commit 7e8773ae authored by Kai Koehne's avatar Kai Koehne Committed by The Qt Project
Browse files

Simplify logic for C++ exception support


exception.prf takes care of all of this.

Change-Id: I6d8ba116a425eecf94557bdd682ca58905e6263a
Reviewed-by: default avatarKarsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Showing with 2 additions and 24 deletions
......@@ -16,18 +16,7 @@ contains(QT_CONFIG, reduce_exports) {
}
# impossible to disable exceptions in clucene atm
CONFIG(exceptions_off) {
CONFIG -= exceptions_off
CONFIG += exceptions
!win32|win32-g++* {
QMAKE_CFLAGS -= -fno-exceptions
QMAKE_CXXFLAGS -= -fno-exceptions
QMAKE_LFLAGS -= -fno-exceptions
QMAKE_CFLAGS += -fexceptions
QMAKE_CXXFLAGS += -fexceptions
QMAKE_LFLAGS += -fexceptions
}
}
CONFIG += exceptions
# otherwise mingw headers do not declare common functions like _i64tow
win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
......
......@@ -11,18 +11,7 @@ load(qt_module)
DEFINES -= QT_ASCII_CAST_WARNINGS
# impossible to disable exceptions in clucene atm and use help lib without
CONFIG(exceptions_off) {
CONFIG -= exceptions_off
CONFIG += exceptions
!win32|win32-g++* {
QMAKE_CFLAGS -= -fno-exceptions
QMAKE_CXXFLAGS -= -fno-exceptions
QMAKE_LFLAGS -= -fno-exceptions
QMAKE_CFLAGS += -fexceptions
QMAKE_CXXFLAGS += -fexceptions
QMAKE_LFLAGS += -fexceptions
}
}
CONFIG += exceptions
RESOURCES += helpsystem.qrc
SOURCES += qhelpenginecore.cpp \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment