Ticket #46606: disable-exceptions.patch

configure

@@ -7881 +7881 @@
     QT_CONFIG="$QT_CONFIG concurrent"
 fi
 
-if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
-    echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
-    exit 1
-fi
-if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
+#if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
+#    echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
+#    exit 1
+#fi
+#if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
     CFG_XMLPATTERNS="$canBuildQtXmlPatterns"
-elif [ "$CFG_EXCEPTIONS" = "no" ]; then
-    CFG_XMLPATTERNS="no"
-fi
+#elif [ "$CFG_EXCEPTIONS" = "no" ]; then
+#    CFG_XMLPATTERNS="no"
+#fi
 if [ "$CFG_XMLPATTERNS" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG xmlpatterns"
 else

src/xmlpatterns/utils/

@@ -274 +274 @@
 #endif
 
 #ifdef QT_NO_EXCEPTIONS
-#error "Patternist uses exceptions and cannot be built without."
+// #error "Patternist uses exceptions and cannot be built without."
+#warning "Patternist uses exceptions and will ignore the fact QtCore is built without"
 #endif
 
 QT_END_NAMESPACE

src/xmlpatterns/

@@ -2 +2 @@
 QPRO_PWD = $$PWD
 QT = core \
     network
+DEFINES -= QT_NO_EXCEPTIONS
 DEFINES += QT_BUILD_XMLPATTERNS_LIB \
-    QT_NO_USING_NAMESPACE
+    QT_NO_USING_NAMESPACE QT_EXCEPTIONS
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF -= -fno-exceptions
+QMAKE_CFLAGS -= -fno-exceptions
+QMAKE_CXXFLAGS -= -fno-exceptions
+QMAKE_LFLAGS -= -fno-exceptions
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \
     QtNetwork

src/corelib/

@@ -1 +1 @@
 TARGET     = QtCore
 QPRO_PWD   = $$PWD
 QT         =
-DEFINES   += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE
+DEFINES   -= QT_NO_EXCEPTIONS
+DEFINES   += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE QT_EXCEPTIONS
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF -= -fno-exceptions
+QMAKE_CFLAGS -= -fno-exceptions
+QMAKE_CXXFLAGS -= -fno-exceptions
+QMAKE_LFLAGS -= -fno-exceptions
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused