From a0d39a9acd4ec0ba26fe7823e006ed7e0818fd55 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 21 May 2012 06:37:43 +0300 Subject: [PATCH] explicitly enable exceptions where they are required commit 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c in qtbase desabled the exceptions support by default for most modules. Make sure we explicitly enable them for plugins and libraries that uses exceptions internally. Change-Id: Id3dc9d572ac7ccd35a869046cfc5d6c4ffec3ba2 Reviewed-by: Lars Knoll Reviewed-by: Friedemann Kleint --- src/libs/3rdparty/botan/src/src.pro | 2 ++ src/libs/utils/utils-lib.pri | 2 ++ src/libs/zeroconf/zeroconf.pro | 1 + src/plugins/debugger/debugger.pro | 2 ++ src/plugins/qmldesigner/qmldesignerplugin.pro | 2 ++ src/plugins/qt4projectmanager/qt-s60/qt-s60.pri | 2 ++ src/plugins/texteditor/texteditor.pro | 1 + src/plugins/valgrind/valgrind.pro | 2 ++ 8 files changed, 14 insertions(+) diff --git a/src/libs/3rdparty/botan/src/src.pro b/src/libs/3rdparty/botan/src/src.pro index 63646891e05..e90c230fcf3 100644 --- a/src/libs/3rdparty/botan/src/src.pro +++ b/src/libs/3rdparty/botan/src/src.pro @@ -5,6 +5,8 @@ PRECOMPILED_HEADER = ../../precompiled_headers/botan_pch.h include(../../../../qtcreatorlibrary.pri) +CONFIG += exceptions + DEPENDPATH += . INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan unix:QMAKE_CXXFLAGS_DEBUG += -O2 diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 6026acf49eb..69050825cd5 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -7,6 +7,8 @@ dll { INCLUDEPATH += $$PWD QT += network script +CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/* + win32-msvc* { # disable warnings caused by botan headers QMAKE_CXXFLAGS += -wd4250 -wd4290 diff --git a/src/libs/zeroconf/zeroconf.pro b/src/libs/zeroconf/zeroconf.pro index 6c1dffaeee0..0d5c07b31cc 100644 --- a/src/libs/zeroconf/zeroconf.pro +++ b/src/libs/zeroconf/zeroconf.pro @@ -1,5 +1,6 @@ QT -= gui QT += network +CONFIG += exceptions TARGET = zeroconf TEMPLATE = lib diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index 4fb8aaa4d01..beff0420f23 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -16,6 +16,8 @@ QT += gui \ network \ script +CONFIG += exceptions + HEADERS += \ basewindow.h \ breakhandler.h \ diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro index aeab5d58a50..fcac4a10ad4 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -1,6 +1,8 @@ TEMPLATE = lib TARGET = QmlDesigner +CONFIG += exceptions + INCLUDEPATH += $$PWD include(../../qtcreatorplugin.pri) diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri index fc8f64a1fe2..f25ce876fd6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri @@ -1,3 +1,5 @@ +CONFIG += exceptions + SOURCES += $$PWD/s60manager.cpp \ $$PWD/symbianidevice.cpp \ $$PWD/symbianideviceconfigwidget.cpp \ diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index 13de7fb2951..ddd2f866923 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = TextEditor DEFINES += TEXTEDITOR_LIBRARY QT += xml network +CONFIG += exceptions greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport include(../../qtcreatorplugin.pri) include(texteditor_dependencies.pri) diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro index f88a5e4d147..95d5ec7f85a 100644 --- a/src/plugins/valgrind/valgrind.pro +++ b/src/plugins/valgrind/valgrind.pro @@ -8,6 +8,8 @@ include(memcheck/memcheck.pri) include(xmlprotocol/xmlprotocol.pri) QT *= network +CONFIG += exceptions + INCLUDEPATH *= $$PWD HEADERS += \