diff --git a/configure b/configure index 8c0002c1b82..a79c03be54e 100755 --- a/configure +++ b/configure @@ -645,7 +645,6 @@ MIN_DBUS_1_VERSION=0.93 # initalize internal variables CFG_CONFIGURE_EXIT_ON_ERROR=yes CFG_PROFILE=no -CFG_EXCEPTIONS=unspecified CFG_GUI=auto # (yes|no|auto) CFG_WIDGETS=yes CFG_QCONFIG=full @@ -891,7 +890,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-directfb|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-qml-debug|-javascript-jit|-rpath|-pkg-config|-force-pkg-config|-icu|-force-asserts|-testcocoon) + -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-directfb|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-qml-debug|-javascript-jit|-rpath|-pkg-config|-force-pkg-config|-icu|-force-asserts|-testcocoon) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1209,15 +1208,6 @@ while [ "$#" -gt 0 ]; do QTCONFIG_CONFIG="$QTCONFIG_CONFIG testcocoon" fi ;; - exceptions|g++-exceptions) - if [ "$VAL" = "no" ]; then - CFG_EXCEPTIONS=no - elif [ "$VAL" = "yes" ]; then - CFG_EXCEPTIONS=yes - else - UNKNOWN_OPT=yes - fi - ;; platform) PLATFORM="$VAL" # keep compatibility with old platform names @@ -2842,8 +2832,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir [-translationdir ] [-sysconfdir ] [-examplesdir ] [-testsdir ] [-release] [-debug] [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] - [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] - [-accessibility] [-no-sql-] [-sql-] + [-largefile] [-no-accessibility] [-accessibility] [-no-sql-] [-sql-] [-plugin-sql-] [-system-sqlite] [-platform] [-D ] [-I ] [-L ] [-help] [-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng] @@ -2944,9 +2933,6 @@ Configure options: -no-largefile ...... Disables large file support. + -largefile ......... Enables Qt to access files larger than 4 GB. - -no-exceptions ..... Disable exceptions on compilers that support it. - * -exceptions ........ Enable exceptions on compilers that support it. - -no-accessibility .. Do not compile Accessibility support. * -accessibility ..... Compile Accessibility support. @@ -5196,17 +5182,6 @@ if [ '!' -z "$W_FLAGS" ]; then QMakeVar add QMAKE_OBJECTIVE_CFLAGS_WARN_ON "$W_FLAGS" fi -# turn off exceptions for the compilers that support it -if [ "$XPLATFORM" != "$PLATFORM" ]; then - COMPILER=`echo $XPLATFORM | cut -f 2- -d-` -else - COMPILER=`echo $PLATFORM | cut -f 2- -d-` -fi - -if [ "$CFG_EXCEPTIONS" != "no" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions" -fi - if [ "$XPLATFORM_MINGW" = "yes" ]; then # mkspecs/features/win32/default_pre.prf sets "no-rtti". # Follow default behavior of configure.exe by overriding with "rtti". @@ -5412,28 +5387,6 @@ if [ "$CFG_QML_DEBUG" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER" fi -if [ "$CFG_EXCEPTIONS" = "no" ]; then - case "$COMPILER" in - g++*) - QMakeVar add QMAKE_CFLAGS -fno-exceptions - QMakeVar add QMAKE_CXXFLAGS -fno-exceptions - QMakeVar add QMAKE_LFLAGS -fno-exceptions - ;; - cc*) - case "$PLATFORM" in - irix-cc*) - QMakeVar add QMAKE_CFLAGS -LANG:exceptions=off - QMakeVar add QMAKE_CXXFLAGS -LANG:exceptions=off - QMakeVar add QMAKE_LFLAGS -LANG:exceptions=off - ;; - *) ;; - esac - ;; - *) ;; - esac - QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off" -fi - case "$COMPILER" in g++*) # GNU C++ @@ -5553,7 +5506,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" -[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" @@ -5860,46 +5812,6 @@ fi #------------------------------------------------------------------------------- exec 3>&1 1>$outpath/config.summary # redirect output temporarily to config.summary -case "$COMPILER" in -g++*) - if [ "$CFG_EXCEPTIONS" != "no" ]; then - cat <] [-qt-sql-]\n" "[-plugin-sql-] [-system-sqlite]\n" @@ -1525,9 +1517,6 @@ bool Configure::displayHelp() desc( "", qPrintable(QString(" %1").arg(defaultBuildParts.at(i))), false, ' '); desc( "-nomake ", "Exclude part from the list of parts to be built.\n"); - desc("EXCEPTIONS", "no", "-no-exceptions", "Disable exceptions on platforms that support it."); - desc("EXCEPTIONS", "yes","-exceptions", "Enable exceptions on platforms that support it.\n"); - desc("WIDGETS", "no", "-no-widgets", "Disable QtWidgets module\n"); desc("ACCESSIBILITY", "no", "-no-accessibility", "Do not compile Windows Active Accessibility support."); @@ -2606,10 +2595,6 @@ void Configure::generateQConfigPri() if (dictionary[ "LTCG" ] == "yes") configStream << " ltcg"; - if (dictionary[ "EXCEPTIONS" ] == "yes") - configStream << " exceptions"; - if (dictionary[ "EXCEPTIONS" ] == "no") - configStream << " exceptions_off"; if (dictionary[ "RTTI" ] == "yes") configStream << " rtti"; if (dictionary[ "SSE2" ] == "yes") @@ -2805,7 +2790,6 @@ void Configure::generateConfigfiles() } if (dictionary["ACCESSIBILITY"] == "no") qconfigList += "QT_NO_ACCESSIBILITY"; - if (dictionary["EXCEPTIONS"] == "no") qconfigList += "QT_NO_EXCEPTIONS"; if (dictionary["WIDGETS"] == "no") qconfigList += "QT_NO_WIDGETS"; if (dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL"; if (dictionary["OPENVG"] == "no") qconfigList += "QT_NO_OPENVG"; @@ -3027,7 +3011,6 @@ void Configure::displayConfig() cout << "Debug symbols..............." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl; cout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl; cout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl; - cout << "Exception support..........." << dictionary[ "EXCEPTIONS" ] << endl; cout << "RTTI support................" << dictionary[ "RTTI" ] << endl; cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl; cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;