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 <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Konstantin Ritt
2012-05-21 06:37:43 +03:00
committed by Friedemann Kleint
parent f1c77a8349
commit a0d39a9acd
8 changed files with 14 additions and 0 deletions

View File

@@ -5,6 +5,8 @@ PRECOMPILED_HEADER = ../../precompiled_headers/botan_pch.h
include(../../../../qtcreatorlibrary.pri) include(../../../../qtcreatorlibrary.pri)
CONFIG += exceptions
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan
unix:QMAKE_CXXFLAGS_DEBUG += -O2 unix:QMAKE_CXXFLAGS_DEBUG += -O2

View File

@@ -7,6 +7,8 @@ dll {
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
QT += network script QT += network script
CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
win32-msvc* { win32-msvc* {
# disable warnings caused by botan headers # disable warnings caused by botan headers
QMAKE_CXXFLAGS += -wd4250 -wd4290 QMAKE_CXXFLAGS += -wd4250 -wd4290

View File

@@ -1,5 +1,6 @@
QT -= gui QT -= gui
QT += network QT += network
CONFIG += exceptions
TARGET = zeroconf TARGET = zeroconf
TEMPLATE = lib TEMPLATE = lib

View File

@@ -16,6 +16,8 @@ QT += gui \
network \ network \
script script
CONFIG += exceptions
HEADERS += \ HEADERS += \
basewindow.h \ basewindow.h \
breakhandler.h \ breakhandler.h \

View File

@@ -1,6 +1,8 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = QmlDesigner TARGET = QmlDesigner
CONFIG += exceptions
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)

View File

@@ -1,3 +1,5 @@
CONFIG += exceptions
SOURCES += $$PWD/s60manager.cpp \ SOURCES += $$PWD/s60manager.cpp \
$$PWD/symbianidevice.cpp \ $$PWD/symbianidevice.cpp \
$$PWD/symbianideviceconfigwidget.cpp \ $$PWD/symbianideviceconfigwidget.cpp \

View File

@@ -2,6 +2,7 @@ TEMPLATE = lib
TARGET = TextEditor TARGET = TextEditor
DEFINES += TEXTEDITOR_LIBRARY DEFINES += TEXTEDITOR_LIBRARY
QT += xml network QT += xml network
CONFIG += exceptions
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(texteditor_dependencies.pri) include(texteditor_dependencies.pri)

View File

@@ -8,6 +8,8 @@ include(memcheck/memcheck.pri)
include(xmlprotocol/xmlprotocol.pri) include(xmlprotocol/xmlprotocol.pri)
QT *= network QT *= network
CONFIG += exceptions
INCLUDEPATH *= $$PWD INCLUDEPATH *= $$PWD
HEADERS += \ HEADERS += \