Ticket #46606: disable-exceptions.patch

File disable-exceptions.patch, 2.6 KB (added by RJVB (René Bertin), 10 years ago)
  • configure

    old new  
    78817881    QT_CONFIG="$QT_CONFIG concurrent"
    78827882fi
    78837883
    7884 if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
    7885     echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
    7886     exit 1
    7887 fi
    7888 if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
     7884#if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
     7885#    echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
     7886#    exit 1
     7887#fi
     7888#if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
    78897889    CFG_XMLPATTERNS="$canBuildQtXmlPatterns"
    7890 elif [ "$CFG_EXCEPTIONS" = "no" ]; then
    7891     CFG_XMLPATTERNS="no"
    7892 fi
     7890#elif [ "$CFG_EXCEPTIONS" = "no" ]; then
     7891#    CFG_XMLPATTERNS="no"
     7892#fi
    78937893if [ "$CFG_XMLPATTERNS" = "yes" ]; then
    78947894    QT_CONFIG="$QT_CONFIG xmlpatterns"
    78957895else
  • src/xmlpatterns/utils/

    old new  
    274274#endif
    275275
    276276#ifdef QT_NO_EXCEPTIONS
    277 #error "Patternist uses exceptions and cannot be built without."
     277// #error "Patternist uses exceptions and cannot be built without."
     278#warning "Patternist uses exceptions and will ignore the fact QtCore is built without"
    278279#endif
    279280
    280281QT_END_NAMESPACE
  • src/xmlpatterns/

    old new  
    22QPRO_PWD = $$PWD
    33QT = core \
    44    network
     5DEFINES -= QT_NO_EXCEPTIONS
    56DEFINES += QT_BUILD_XMLPATTERNS_LIB \
    6     QT_NO_USING_NAMESPACE
     7    QT_NO_USING_NAMESPACE QT_EXCEPTIONS
     8QMAKE_CXXFLAGS_EXCEPTIONS_OFF -= -fno-exceptions
     9QMAKE_CFLAGS -= -fno-exceptions
     10QMAKE_CXXFLAGS -= -fno-exceptions
     11QMAKE_LFLAGS -= -fno-exceptions
    712win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
    813unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \
    914    QtNetwork
  • src/corelib/

    old new  
    11TARGET     = QtCore
    22QPRO_PWD   = $$PWD
    33QT         =
    4 DEFINES   += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE
     4DEFINES   -= QT_NO_EXCEPTIONS
     5DEFINES   += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE QT_EXCEPTIONS
     6QMAKE_CXXFLAGS_EXCEPTIONS_OFF -= -fno-exceptions
     7QMAKE_CFLAGS -= -fno-exceptions
     8QMAKE_CXXFLAGS -= -fno-exceptions
     9QMAKE_LFLAGS -= -fno-exceptions
    510win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
    611irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
    712