diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/exceptions.prf (renamed from mkspecs/features/win32/exceptions.prf) | 1 | ||||
| -rw-r--r-- | mkspecs/features/exceptions_off.prf (renamed from mkspecs/features/win32/exceptions_off.prf) | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index f4292c3312..2876e7d29e 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,6 +1,6 @@ load(exclusive_builds) ### Qt 5: remove "uic" and "resources" - or add "qt" -CONFIG = lex yacc warn_on debug uic resources $$CONFIG +CONFIG = lex yacc warn_on debug uic resources exceptions $$CONFIG !build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { PRO_BASENAME = $$basename(_PRO_FILE_) diff --git a/mkspecs/features/win32/exceptions.prf b/mkspecs/features/exceptions.prf index 786665920f..ebfd5837cf 100644 --- a/mkspecs/features/win32/exceptions.prf +++ b/mkspecs/features/exceptions.prf @@ -2,4 +2,5 @@ CONFIG -= exceptions_off QMAKE_CFLAGS *= $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS *= $$QMAKE_CXXFLAGS_EXCEPTIONS_ON QMAKE_LFLAGS *= $$QMAKE_LFLAGS_EXCEPTIONS_ON +DEFINES -= QT_NO_EXCEPTIONS diff --git a/mkspecs/features/win32/exceptions_off.prf b/mkspecs/features/exceptions_off.prf index 9de53d3417..9c8a4043ea 100644 --- a/mkspecs/features/win32/exceptions_off.prf +++ b/mkspecs/features/exceptions_off.prf @@ -2,4 +2,4 @@ CONFIG -= exceptions QMAKE_CFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_EXCEPTIONS_OFF QMAKE_LFLAGS += $$QMAKE_LFLAGS_EXCEPTIONS_OFF - +DEFINES += QT_NO_EXCEPTIONS diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index b71ef61252..865e3e51e5 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -28,3 +28,6 @@ mac { CONFIG += absolute_library_soname } } + +# Qt modules get compiled without exceptions enabled by default +CONFIG += exceptions_off |