remove symbian support from configure

Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

config.tests/symbian/audio/.gitignore

@@ -1,2 +0,0 @@
-audio.rpp
-audio.rsg

config.tests/symbian/audio/audio.cpp

@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <sounddevice.h>
-
-int main(int argc, char **argv)
-{
-    return 0;
-}

config.tests/symbian/audio/audio.pro

@@ -1,10 +0,0 @@
-TARGET = audio
-SOURCES = audio.cpp
-
-INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server
-INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common
-INCLUDEPATH += $${EPOCROOT}epoc32/include/platform
-
-LIBS += -lmmfdevsound
-CONFIG -= qt
-QT =

config.tests/symbian/compile.test

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-SUCCESS=no
-QMKSPEC=$1
-XPLATFORM=`basename "$1"`
-QMAKE_CONFIG=$2
-VERBOSE=$3
-SRCDIR=$4
-OUTDIR=$5
-TEST=$6
-EXE=`basename "$6"`
-DESCRIPTION=$7
-shift 7
-LFLAGS=""
-INCLUDEPATH=""
-CXXFLAGS=""
-MAC_ARCH_CXXFLAGS=""
-MAC_ARCH_LFLAGS=""
-
-# debuggery
-[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
-
-test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
-
-cd "$OUTDIR/$TEST"
-
-test -r Makefile && $MAKE distclean >/dev/null 2>&1
-
-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-
-if [ "$VERBOSE" = "yes" ]; then
-    $MAKE
-else
-    $MAKE >/dev/null 2>&1
-fi
-
-[ -x "$EXE.exe" ] && SUCCESS=yes
-
-# done
-if [ "$SUCCESS" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled."
-    exit 1
-else
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled."
-    exit 0
-fi

config.tests/symbian/simple/main.cpp

@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <stdio.h>
-
-int main(int, char **) {
-    printf("test\n");
-    return 0;
-}

config.tests/symbian/simple/simple.pro

@@ -1,5 +0,0 @@
-TEMPLATE = app
-CONFIG -= qt
-QT = 
-SOURCES += main.cpp
-

configure

@@ -669,8 +669,6 @@ CFG_XVIDEO=auto
 CFG_XINERAMA=runtime
 CFG_XFIXES=runtime
 CFG_ZLIB=auto
-CFG_SYMBIAN_DEFFILES=auto
-CFG_S60=auto
 CFG_SQLITE=qt
 CFG_GIF=auto
 CFG_TIFF=auto
@@ -761,7 +759,6 @@ CFG_DBUS=auto
 CFG_GLIB=auto
 CFG_GSTREAMER=auto
 CFG_QGTKSTYLE=auto
-CFG_QS60STYLE=auto
 CFG_LARGEFILE=auto
 CFG_OPENSSL=auto
 CFG_PTMALLOC=no
@@ -817,10 +814,8 @@ RPATH_FLAGS=
 l_FLAGS=
 W_FLAGS=
 QCONFIG_FLAGS=
-XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++" or "symbian-gcce"
+XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++"
 XPLATFORM_MINGW=no      # Whether target platform is MinGW (win32-g++*)
-XPLATFORM_SYMBIAN=no    # Whether target platform is SYMBIAN (*symbian*)
-XPLATFORM_SYMBIAN_SBSV2=no # Whether target platform is SYMBIAN_SBSV2 (symbian-sbsv2)
 XPLATFORM_MAEMO=no
 PLATFORM=$QMAKESPEC
 QT_CROSS_COMPILE=no
@@ -876,9 +871,6 @@ QT_LIBS_GLIB=
 QT_CFLAGS_GSTREAMER=
 QT_LIBS_GSTREAMER=
 
-#flag for Symbian fpu settings
-QT_CFLAGS_FPU=
-
 # flags for libconnsettings0 (used for Maemo ICD bearer management plugin)
 QT_CFLAGS_CONNSETTINGS=
 QT_LIBS_CONNSETTINGS=
@@ -1045,7 +1037,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
+    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -1597,9 +1589,6 @@ while [ "$#" -gt 0 ]; do
     xplatform)
         XPLATFORM="$VAL"
         case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
-        case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac
-        case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac
-        case "$XPLATFORM" in linux-g++-maemo) XPLATFORM_MAEMO=yes;; esac
         ;;
     debug-and-release)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
@@ -1870,20 +1859,6 @@ while [ "$#" -gt 0 ]; do
         # No longer supported:
         #[ "$VAL" = "no" ] && CFG_LIBPNG=no
         ;;
-    s60)
-        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-            CFG_S60="$VAL"
-        else
-            UNKNOWN_OPT=yes
-        fi
-        ;;
-    usedeffiles)
-        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-            CFG_SYMBIAN_DEFFILES="$VAL"
-        else
-            UNKNOWN_OPT=yes
-        fi
-        ;;
     sqlite)
         if [ "$VAL" = "system" ]; then
             CFG_SQLITE=system
@@ -2028,13 +2003,6 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    style-s60)
-        if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ]; then
-            CFG_QS60STYLE="$VAL"
-        else
-            UNKNOWN_OPT=yes
-        fi
-        ;;
     gui)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
             CFG_GUI="yes"
@@ -2428,11 +2396,6 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    fpu)
-       if [ "$VAL" != "no" ]; then
-          QT_CFLAGS_FPU=$VAL
-       fi
-       ;;
     icu)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_ICU="$VAL"
@@ -2492,7 +2455,6 @@ esac
 # where to find which..
 unixtests="$relpath/config.tests/unix"
 mactests="$relpath/config.tests/mac"
-symbiantests="$relpath/config.tests/symbian"
 WHICH="$unixtests/which.test"
 
 PERL=`$WHICH perl 2>/dev/null`
@@ -2929,8 +2891,6 @@ fi
 [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM"
 
 case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
-case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac
-case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac
 case "$XPLATFORM" in linux-g++-maemo) XPLATFORM_MAEMO=yes;; esac
 
 if [ -d "$PLATFORM" ]; then
@@ -3210,8 +3170,6 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
     esac
 elif [ "$XPLATFORM_MINGW" = "yes" ]; then
     [ -z "$CFG_ARCH" ] && CFG_ARCH="windows"
-elif [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    CFG_ARCH=symbian
 elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
     CFG_ARCH=$CFG_HOST_ARCH
 fi
@@ -3370,7 +3328,6 @@ TEST_COMPILER="$CXX"
 
 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
 if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
-    #for Symbian we don't need this checking
     if [ -z "$TEST_COMPILER" ]; then
         echo "ERROR: Cannot set the compiler for the configuration tests"
         exit 1
@@ -3484,7 +3441,7 @@ if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then
 fi
 
 # mac
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then
+if [ "$PLATFORM_MAC" = "yes" ]; then
     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
         CFG_OPENGL=desktop
     fi
@@ -3552,19 +3509,6 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then
 fi
 QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"`
 
-if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    [ -z "$QT_HOST_PREFIX" ] && QT_HOST_PREFIX="$QT_INSTALL_PREFIX"
-    [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS=
-    [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS=
-    [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS=
-    [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS=
-    [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="\\\\resource\\\\qt$QT_LIBINFIX\\\\plugins"
-    [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="\\\\resource\\\\qt$QT_LIBINFIX\\\\imports"
-    [ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=
-    [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS="\\\\resource\\\\qt$QT_LIBINFIX\\\\translations"
-    [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=
-    [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES=
-else
 #docs
 if [ -z "$QT_INSTALL_DOCS" ]; then #default
     if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
@@ -3612,7 +3556,6 @@ else
         fi
     fi
     [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback
-
 fi
 QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"`
 
@@ -3670,7 +3613,6 @@ else
     [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback
 fi
 QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"`
-fi
 
 #-------------------------------------------------------------------------------
 # help - interactive parts of the script _after_ this section please
@@ -4453,19 +4395,6 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" -o "$PLATFORM_X11" = "ye
 EOF
 fi
 
-if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    cat << EOF
-
-Qt for Symbian only:
-    -no-s60 ............ Do not compile in S60 support.
- +  -s60 ............... Compile with support for the S60 UI Framework.
-    -no-style-s60....... Disable s60 style
- +  -qt-style-s60....... Enable s60 style in the Qt Library
-
-    -no-usedeffiles .... Disable the usage of DEF files.
- *  -usedeffiles ....... Enable the usage of DEF files.
-EOF
-fi
    [ "x$ERROR" = "xyes" ] && exit 1
    exit 0
 fi # Help
@@ -4479,8 +4408,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
     Platform="Qt for Embedded Linux"
 elif [ "$PLATFORM_QPA" = "yes" ]; then
     Platform="Qt Lighthouse"
-elif [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    Platform="Qt for Symbian"
 elif [ "$PLATFORM_MAC" = "yes" ]; then
     Platform="Qt for Mac OS X"
 elif [ "$XPLATFORM_MINGW" = "yes" ]; then
@@ -5121,53 +5048,6 @@ fi
 
 [ "$XPLATFORM_MINGW" = "yes" ] && QMakeVar add styles "windowsxp windowsvista"
 
-if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    QMakeVar set styles "windows s60"   #overwrite previous default
-    CFG_LIBFREETYPE=no
-    CFG_ZLIB=yes
-
-    if [ "$CFG_LARGEFILE" = auto ]; then
-        CFG_LARGEFILE=no
-    fi
-    if [ "$CFG_PHONON" = auto ]; then
-        CFG_PHONON=yes
-    fi
-
-    if test -z "$EPOCROOT"; then
-        echo "Please export EPOCROOT. It should point to the sdk install dir"
-        exit 1
-    fi
-    if test ! -d "$EPOCROOT/epoc32"; then
-        echo "Could not find the 'epoc32' dir in your EPOCROOT."
-        exit 1
-    fi
-
-    if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
-        # Raptor does not support configure tests.
-
-        # the main commands needed to compile;
-        (mkdir -p config.tests/symbian/rcomp
-            cd config.tests/symbian/rcomp
-            rm -f rcomp_test.rsg
-            touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss
-            rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null
-            if test ! -f rcomp_test.rsg; then
-                echo "Finding a working rcomp in your PATH failed."
-                echo "Fatal error. Make sure you have the epoc tools working and in your PATH";
-                exit 1;
-            fi
-        )
-
-        # compile a simple main that uses printf
-        if ! "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/simple "simple" $L_FLAGS $I_FLAGS $l_FLAGS
-        then
-            echo "Testing your compiler failed. Could not compile a simple application."
-            echo "Fatal error; Rerun configure with -verbose to get more details."
-            exit 1;
-        fi
-    fi
-fi
-
 # detect zlib
 if [ "$CFG_ZLIB" = "no" ]; then
     # Note: Qt no longer support builds without zlib
@@ -5195,32 +5075,6 @@ if [ "$CFG_LARGEFILE" = "auto" ]; then
     CFG_LARGEFILE=yes
 fi
 
-
-if [ "$CFG_S60" = "auto" ]; then
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-        CFG_S60=yes
-    else
-        CFG_S60=no
-    fi
-fi
-
-if [ "$CFG_QS60STYLE" = "auto" ]; then
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-        CFG_QS60STYLE=qt
-    else
-        CFG_QS60STYLE=no
-    fi
-fi
-
-if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then
-    # elf2e32 crashes when using def files together with gcce.
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ] && [ "$CFG_DEV" = "no" ] && [ "$XPLATFORM" != "symbian-gcce" ]; then
-        CFG_SYMBIAN_DEFFILES=yes
-    else
-        CFG_SYMBIAN_DEFFILES=no
-    fi
-fi
-
 # detect how jpeg should be built
 if [ "$CFG_JPEG" = "auto" ]; then
     if [ "$CFG_SHARED" = "yes" ]; then
@@ -5293,13 +5147,8 @@ fi
 
 # detect accessibility
 if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-        # accessibility is currently unsupported
-        CFG_ACCESSIBILITY=no
-    else
     CFG_ACCESSIBILITY=yes
 fi
-fi
 
 # auto-detect SQL-modules support
 for _SQLDR in $CFG_SQL_AVAILABLE; do
@@ -5509,15 +5358,6 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
             fi
             ;;
         sqlite)
-            if [ "$CFG_SQL_sqlite" = "auto" ]; then # the default
-                if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-                    # sqlite on symbian is typically not build in Qt but deployed as a pre-existing sis file and should be marked as driver.
-                    # Configuration parameters should be set
-                    CFG_SQL_sqlite=qt
-                    QT_LFLAGS_SQLITE=-lsqlite3
-                    QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
-                fi
-            fi
             if [ "$CFG_SQL_sqlite" != "no" ]; then
                 SQLITE_AUTODETECT_FAILED="no"
                 if [ "$CFG_SQLITE" = "system" ]; then
@@ -5837,8 +5677,8 @@ if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then
     fi
 fi
 
-# X11/MINGW/SYMBIAN OpenGL
+# X11/MINGW OpenGL
-if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIAN" = "yes" ]; then
+if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
     # auto-detect OpenGL support (es2 = OpenGL ES 2.x)
     if [ "$CFG_GUI" = "no" ]; then
         if [ "$CFG_OPENGL" = "auto" ]; then
@@ -6569,9 +6409,7 @@ fi
 if [ "$CFG_ENDIAN" = "auto" ]; then
     if [ "$XPLATFORM_MINGW" = "yes" ]; then
         CFG_ENDIAN="Q_LITTLE_ENDIAN"
-    elif [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then
+    elif [ "$PLATFORM_MAC" = "yes" ]; then
-        CFG_ENDIAN="Q_LITTLE_ENDIAN"
-    elif [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then
         true #leave as auto
     else
         "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
@@ -6658,7 +6496,7 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
 fi
 
 HAVE_STL=no
-if [ "$XPLATFORM_SYMBIAN" = "yes" ] || "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
     HAVE_STL=yes
 fi
 
@@ -6776,7 +6614,7 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then
 fi
 
 # detect OpenSSL
-if [ "$CFG_OPENSSL" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+if [ "$CFG_OPENSSL" != "no" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
         if [ "$CFG_OPENSSL" = "auto" ]; then
             CFG_OPENSSL=yes
@@ -6792,15 +6630,10 @@ if [ "$CFG_OPENSSL" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
             CFG_OPENSSL=no
         fi
     fi
-else
-    if [ "$CFG_OPENSSL" = "auto" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then
-        #OpenSSl should be enabled for Symbian release
-        CFG_OPENSSL=yes
-    fi
 fi
 
 # detect OpenVG support
-if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+if [ "$CFG_OPENVG" != "no" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
         if [ "$CFG_OPENVG" = "auto" ]; then
             CFG_OPENVG=yes
@@ -6857,15 +6690,12 @@ if [ "$CFG_PTMALLOC" != "no" ]; then
     QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a"
 fi
 
-if [ "$CFG_ALSA" = "auto" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+if [ "$CFG_ALSA" = "auto" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/alsa "alsa" $L_FLAGS $I_FLAGS $l_FLAGS; then
         CFG_ALSA=yes
     else
         CFG_ALSA=no
     fi
-elif [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then
-    # Disabled for Symbian release
-    CFG_ALSA=no
 fi
 
 if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then 
@@ -6876,9 +6706,6 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto"
         fi
     else
 	case "$XPLATFORM" in
-	    symbian-gcce)
-		CFG_JAVASCRIPTCORE_JIT=no
-		;;
 	    linux-icc*)
 		CFG_JAVASCRIPTCORE_JIT=no
 		;;
@@ -6893,21 +6720,12 @@ elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then
 fi
 
 if [ "$CFG_AUDIO_BACKEND" = "auto" ]; then
-    if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-         if "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/audio "audio" $L_FLAGS $I_FLAGS $l_FLAGS ; then
     CFG_AUDIO_BACKEND=yes
 fi
-    else
-        CFG_AUDIO_BACKEND=yes
-    fi
-fi
 
 if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then
     echo "Warning: largefile support cannot be disabled for win32."
     CFG_LARGEFILE="yes"
-elif [ "$CFG_LARGEFILE" != "no" ] && [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    echo "Warning: largefile support cannot be enabled for symbian."
-    CFG_LARGEFILE="no"
 fi
 
 #-------------------------------------------------------------------------------
@@ -7017,13 +6835,12 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
     fi
 fi
 
-# but disable Cocoa if cross-building for mingw and symbian
+# but disable Cocoa if cross-building for mingw
 [ "$XPLATFORM_MINGW" = "yes" ] && CFG_MAC_COCOA="no"
-[ "$XPLATFORM_SYMBIAN" = "yes" ] && CFG_MAC_COCOA="no"
 
-# disable Qt 3 support on VxWorks and Symbian
+# disable Qt 3 support on VxWorks
 case "$XPLATFORM" in
-    unsupported/vxworks*|symbian*)
+    unsupported/vxworks*)
 	CFG_QT3SUPPORT="no"
     ;;
 esac
@@ -7083,19 +6900,6 @@ else
     fi
 fi
 
-if [ "$CFG_QS60STYLE" = "no" ]; then
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_STYLE_S60"
-fi
-
-# Just check if OpenGL is not set by command argumets for Symbian.
-if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-        if [ "$CFG_OPENGL" = "auto" ]; then
-            CFG_OPENGL="no"
-        fi
-fi
-
 # enable opengl
 if [ "$CFG_OPENGL" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
@@ -7279,7 +7083,7 @@ else
 fi
 
 
-if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
+if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then
     #On Mac we implicitly link against libz, so we
     #never use the 3rdparty stuff.
     [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
@@ -7290,16 +7094,6 @@ elif [ "$CFG_ZLIB" = "system" ]; then
     QT_CONFIG="$QT_CONFIG system-zlib"
 fi
 
-if [ "$CFG_S60" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG s60"
-fi
-
-if [ "$CFG_SYMBIAN_DEFFILES" = "yes" ]; then
-    QTCONFIG_CONFIG="$QTCONFIG_CONFIG def_files"
-else
-    QTCONFIG_CONFIG="$QTCONFIG_CONFIG def_files_disabled"
-fi
-
 [ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis"
 [ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups"
 [ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv"
@@ -7576,10 +7370,6 @@ EOF
         canBuildWebKit="no"
         canBuildQtConcurrent="no"
 	;;
-    symbian-gcce)
-        ;;
-    symbian-armcc)
-        ;;
 esac
 
 if [ "$CFG_GUI" = "no" ]; then
@@ -7673,14 +7463,7 @@ if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
     exit 1
 fi
 if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then
-    case "$XPLATFORM" in
-    symbian*)
-        CFG_SCRIPTTOOLS="no"
-        ;;
-    *)
     CFG_SCRIPTTOOLS="yes"
-        ;;
-    esac
 elif [ "$CFG_SCRIPT" = "no" ]; then
     CFG_SCRIPTTOOLS="no"
 fi
@@ -8044,7 +7827,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
 [ "$CFG_JPEG" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG"
 [ "$CFG_MNG" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG"
 [ "$CFG_ZLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
-[ "$CFG_S60" != "yes" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60"
 [ "$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"
@@ -8056,6 +7838,9 @@ if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
     [ "$CFG_GRAPHICS_SYSTEM" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RUNTIME"
 fi
 
+# ATM we need this define to compile Qt. Remove later!
+QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60"
+
 # X11/Unix/Mac only configs
 [ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
 [ "$CFG_ICONV" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
@@ -8101,14 +7886,6 @@ fi
 [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
 QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
 
-if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    # Enable Symbian DLLs and export rules.
-    # We cannot use Linux's default export rules since they export everything.
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL"
-    # Disable non-working features.
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON"
-fi
-
 if [ -n "$QCONFIG_FLAGS" ]; then
 cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
 #ifndef QT_BOOTSTRAPPED
@@ -8220,12 +7997,6 @@ if [ "$CFG_DEV" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG private_tests"
 fi
 
-if [ -z "$QT_CFLAGS_FPU" ]; then
-    if echo "$XPLATFORM" | grep "symbian-sbsv2" > /dev/null 2>&1; then
-        QT_CFLAGS_FPU=softvfp
-    fi
-fi
-
 # Make the application arch follow the Qt arch for single arch builds.
 # (for multiple-arch builds, set CONFIG manually in the application .pro file)
 if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then
@@ -8269,10 +8040,6 @@ if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
     echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp"
     echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp"
 fi
-if [ -n "$QT_CFLAGS_FPU" ]; then
-    echo "#Qt for symbian FPU settings" >> "$QTCONFIG.tmp"
-    echo "MMP_RULES += \"ARMFPU $QT_CFLAGS_FPU\"" >> "$QTCONFIG.tmp"
-fi
 
 if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then
     echo "#Qt opengl include path" >> "$QTCONFIG.tmp"
@@ -8547,8 +8314,6 @@ if [ "$CFG_DECLARATIVE" = "yes" ]; then
     echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
 fi
 echo "Location module ........ $CFG_LOCATION"
-echo "Support for S60 ........ $CFG_S60"
-echo "Symbian DEF files ...... $CFG_SYMBIAN_DEFFILES"
 echo "STL support ............ $CFG_STL"
 echo "PCH support ............ $CFG_PRECOMPILE"
 echo "MMX/3DNOW/SSE/SSE2/SSE3. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_SSE3}"
@@ -8890,10 +8655,6 @@ for file in .projects .projects.3; do
                 continue
             fi
             SPEC=$XQMAKESPEC ;;
-        *s60main/s60main.pro)
-            if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
-                continue
-            fi;;
         *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;

tools/configure/configure.pro

@@ -70,7 +70,6 @@ HEADERS  = configureapp.h environment.h tools.h\
            $$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror_p.h \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.h \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils_p.h \
-           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot_p.h \
            $$QT_SOURCE_TREE/tools/shared/windows/registry_p.h
 
 
@@ -126,7 +125,6 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils.cpp \
-           $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
            $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
 
 DEFINES += COMMERCIAL_VERSION

tools/configure/configureapp.cpp

@@ -193,34 +193,6 @@ Configure::Configure(int& argc, char** argv)
             }
         }
 
-        // make patch_capabilities and createpackage scripts for Symbian that can be used from the shadow build
-        QFile patch_capabilities(buildPath + "/bin/patch_capabilities");
-        if (patch_capabilities.open(QFile::WriteOnly)) {
-            QTextStream stream(&patch_capabilities);
-            stream << "#!/usr/bin/perl -w" << endl
-                   << "require \"" << sourcePath + "/bin/patch_capabilities\";" << endl;
-        }
-        QFile patch_capabilities_bat(buildPath + "/bin/patch_capabilities.bat");
-        if (patch_capabilities_bat.open(QFile::WriteOnly)) {
-            QTextStream stream(&patch_capabilities_bat);
-            stream << "@echo off" << endl
-                   << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/patch_capabilities.bat %*") << endl;
-            patch_capabilities_bat.close();
-        }
-        QFile createpackage(buildPath + "/bin/createpackage");
-        if (createpackage.open(QFile::WriteOnly)) {
-            QTextStream stream(&createpackage);
-            stream << "#!/usr/bin/perl -w" << endl
-                   << "require \"" << sourcePath + "/bin/createpackage\";" << endl;
-        }
-        QFile createpackage_bat(buildPath + "/bin/createpackage.bat");
-        if (createpackage_bat.open(QFile::WriteOnly)) {
-            QTextStream stream(&createpackage_bat);
-            stream << "@echo off" << endl
-                   << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/createpackage.bat %*") << endl;
-            createpackage_bat.close();
-        }
-
         QFile configtests(buildPath + "/bin/qtmodule-configtests");
         if (configtests.open(QFile::WriteOnly)) {
             QTextStream stream(&configtests);
@@ -350,7 +322,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "OPENVG" ]          = "no";
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "DBUS" ]            = "auto";
-    dictionary[ "S60" ]             = "yes";
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
     dictionary[ "STYLE_WINDOWSXP" ] = "auto";
@@ -361,7 +332,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
     dictionary[ "STYLE_MOTIF" ]     = "yes";
     dictionary[ "STYLE_CDE" ]       = "yes";
-    dictionary[ "STYLE_S60" ]       = "no";
     dictionary[ "STYLE_GTK" ]       = "no";
 
     dictionary[ "SQL_MYSQL" ]       = "no";
@@ -519,9 +489,6 @@ void Configure::parseCmdLine()
             dictionary[ "BUILDNOKIA" ] = "yes";
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
-            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-                dictionary[ "SYMBIAN_DEFFILES" ] = "no";
-            }
         }
         else if (configCmdLine.at(i) == "-opensource") {
             dictionary[ "BUILDTYPE" ] = "opensource";
@@ -714,11 +681,6 @@ void Configure::parseCmdLine()
         else if (configCmdLine.at(i) == "-no-style-cde")
             dictionary[ "STYLE_CDE" ] = "no";
 
-        else if (configCmdLine.at(i) == "-qt-style-s60")
-            dictionary[ "STYLE_S60" ] = "yes";
-        else if (configCmdLine.at(i) == "-no-style-s60")
-            dictionary[ "STYLE_S60" ] = "no";
-
         // Qt 3 Support ---------------------------------------------
         else if (configCmdLine.at(i) == "-no-qt3support")
             dictionary[ "QT3SUPPORT" ] = "no";
@@ -865,25 +827,6 @@ void Configure::parseCmdLine()
         else if (configCmdLine.at(i) == "-no-native-gestures")
             dictionary[ "NATIVE_GESTURES" ] = "no";
 #if !defined(EVAL)
-        // Symbian Support -------------------------------------------
-        else if (configCmdLine.at(i) == "-fpu")
-        {
-            ++i;
-            if (i == argCount)
-                break;
-            dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i);
-        }
-
-        else if (configCmdLine.at(i) == "-s60")
-            dictionary[ "S60" ]    = "yes";
-        else if (configCmdLine.at(i) == "-no-s60")
-            dictionary[ "S60" ]    = "no";
-
-        else if (configCmdLine.at(i) == "-usedeffiles")
-            dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
-        else if (configCmdLine.at(i) == "-no-usedeffiles")
-            dictionary[ "SYMBIAN_DEFFILES" ] = "no";
-
         // Others ---------------------------------------------------
         else if (configCmdLine.at(i) == "-fast")
             dictionary[ "FAST" ] = "yes";
@@ -1038,14 +981,6 @@ void Configure::parseCmdLine()
             if (i == argCount)
                 break;
             dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i);
-            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-                dictionary[ "QT_INSTALL_PLUGINS" ] =
-                    QString("\\resource\\qt%1\\plugins").arg(dictionary[ "QT_LIBINFIX" ]);
-                dictionary[ "QT_INSTALL_IMPORTS" ] =
-                    QString("\\resource\\qt%1\\imports").arg(dictionary[ "QT_LIBINFIX" ]);
-                dictionary[ "QT_INSTALL_TRANSLATIONS" ] =
-                    QString("\\resource\\qt%1\\translations").arg(dictionary[ "QT_LIBINFIX" ]);
-            }
         } else if (configCmdLine.at(i) == "-D") {
             ++i;
             if (i == argCount)
@@ -1285,9 +1220,7 @@ void Configure::parseCmdLine()
     // Tell the user how to proceed building Qt after configure finished its job
     dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"];
     if (dictionary.contains("XQMAKESPEC")) {
-        if (dictionary["XQMAKESPEC"].startsWith("symbian")) {
+        if (dictionary["XQMAKESPEC"].startsWith("wince")) {
-            dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv5|release-armv5");
-        } else if (dictionary["XQMAKESPEC"].startsWith("wince")) {
             dictionary["QTBUILDINSTRUCTION"] =
                 QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"];
         }
@@ -1516,7 +1449,6 @@ void Configure::applySpecSpecifics()
         dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
         dictionary[ "STYLE_MOTIF" ]         = "no";
         dictionary[ "STYLE_CDE" ]           = "no";
-        dictionary[ "STYLE_S60" ]           = "no";
         dictionary[ "FREETYPE" ]            = "no";
         dictionary[ "QT3SUPPORT" ]          = "no";
         dictionary[ "OPENGL" ]              = "no";
@@ -1543,52 +1475,6 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
         dictionary[ "QT_INSTALL_PREFIX" ]   = "";
 
-    } else if (dictionary[ "XQMAKESPEC" ].startsWith("symbian")) {
-        dictionary[ "ACCESSIBILITY" ]       = "no";
-        dictionary[ "STYLE_WINDOWSXP" ]     = "no";
-        dictionary[ "STYLE_WINDOWSVISTA" ]  = "no";
-        dictionary[ "STYLE_PLASTIQUE" ]     = "no";
-        dictionary[ "STYLE_CLEANLOOKS" ]    = "no";
-        dictionary[ "STYLE_WINDOWSCE" ]     = "no";
-        dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
-        dictionary[ "STYLE_MOTIF" ]         = "no";
-        dictionary[ "STYLE_CDE" ]           = "no";
-        dictionary[ "STYLE_S60" ]           = "yes";
-        dictionary[ "FREETYPE" ]            = "no";
-        dictionary[ "QT3SUPPORT" ]          = "no";
-        dictionary[ "OPENGL" ]              = "no";
-        dictionary[ "OPENSSL" ]             = "yes";
-        dictionary[ "STL" ]                 = "yes";
-        dictionary[ "EXCEPTIONS" ]          = "yes";
-        dictionary[ "RTTI" ]                = "yes";
-        dictionary[ "ARCHITECTURE" ]        = "symbian";
-        dictionary[ "3DNOW" ]               = "no";
-        dictionary[ "SSE" ]                 = "no";
-        dictionary[ "SSE2" ]                = "no";
-        dictionary[ "MMX" ]                 = "no";
-        dictionary[ "IWMMXT" ]              = "no";
-        dictionary[ "CE_CRT" ]              = "no";
-        dictionary[ "DIRECT3D" ]            = "no";
-        dictionary[ "WEBKIT" ]              = "yes";
-        dictionary[ "ASSISTANT_WEBKIT" ]    = "no";
-        dictionary[ "PHONON" ]              = "yes";
-        dictionary[ "XMLPATTERNS" ]         = "yes";
-        dictionary[ "QT_GLIB" ]             = "no";
-        dictionary[ "S60" ]                 = "yes";
-        dictionary[ "SYMBIAN_DEFFILES" ]    = "yes";
-        // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested)
-        // iconv_open seems to return -1 always, so something is probably missing from the platform.
-        dictionary[ "QT_ICONV" ]            = "no";
-        dictionary[ "SCRIPTTOOLS" ]         = "no";
-        dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
-        dictionary[ "QT_INSTALL_PREFIX" ]   = "";
-        dictionary[ "QT_INSTALL_PLUGINS" ]  = "\\resource\\qt\\plugins";
-        dictionary[ "QT_INSTALL_IMPORTS" ]  = "\\resource\\qt\\imports";
-        dictionary[ "QT_INSTALL_TRANSLATIONS" ]  = "\\resource\\qt\\translations";
-        dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
-        dictionary[ "SQL_SQLITE" ]          = "yes";
-        dictionary[ "SQL_SQLITE_LIB" ]      = "system";
-
     } else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
       //TODO
         dictionary[ "STYLE_WINDOWSXP" ]     = "no";
@@ -1816,6 +1702,8 @@ bool Configure::displayHelp()
         desc("LIBJPEG", "qt",    "-qt-libjpeg",         "Use the libjpeg bundled with Qt.");
         desc("LIBJPEG", "system","-system-libjpeg",     "Use libjpeg from the operating system.\nSee http://www.ijg.org\n");
 
+        desc("FREETYPE", "no",   "-no-freetype",        "Do not compile in Freetype2 support.");
+        desc("FREETYPE", "yes",  "-qt-freetype",        "Use the libfreetype bundled with Qt.");
 #endif
         // Qt\Windows only options go below here --------------------------------------------------------------------------------
         desc("Qt for Windows only:\n\n");
@@ -1883,7 +1771,6 @@ bool Configure::displayHelp()
                                                         "Available values for <arch>:");
         desc("ARCHITECTURE","windows",       "",        "  windows", ' ');
         desc("ARCHITECTURE","windowsce",     "",        "  windowsce", ' ');
-        desc("ARCHITECTURE","symbian",     "",          "  symbian", ' ');
         desc("ARCHITECTURE","boundschecker",     "",    "  boundschecker", ' ');
         desc("ARCHITECTURE","generic", "",              "  generic\n", ' ');
 
@@ -1899,7 +1786,6 @@ bool Configure::displayHelp()
         desc("STYLE_CDE", "yes", "",                    "  cde", ' ');
         desc("STYLE_WINDOWSCE", "yes", "",              "  windowsce", ' ');
         desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile", ' ');
-        desc("STYLE_S60" , "yes", "",                   "  s60\n", ' ');
         desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7.");
         desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.");
         desc("MSVC_MP", "no", "-no-mp",                 "Do not use multiple processors for compiling with MSVC");
@@ -1929,16 +1815,6 @@ bool Configure::displayHelp()
         desc(                      "-signature <file>",    "Use file for signing the target project");
 
         desc("DIRECTSHOW", "no",   "-phonon-wince-ds9",    "Enable Phonon Direct Show 9 backend for Windows CE");
-
-        // Qt\Symbian only options go below here -----------------------------------------------------------------------------
-        desc("Qt for Symbian OS only:\n\n");
-        desc("FREETYPE", "no",     "-no-freetype",         "Do not compile in Freetype2 support.");
-        desc("FREETYPE", "yes",    "-qt-freetype",         "Use the libfreetype bundled with Qt.");
-        desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
-        desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
-        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework");
-        desc("SYMBIAN_DEFFILES", "no",  "-no-usedeffiles",  "Disable the usage of DEF files.");
-        desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles",     "Enable the usage of DEF files.\n");
         return true;
     }
     return false;
@@ -2105,21 +1981,12 @@ bool Configure::checkAvailability(const QString &part)
     else if (part == "SQL_DB2")
         available = findFile("sqlcli.h") && findFile("sqlcli1.h") && findFile("db2cli.lib");
     else if (part == "SQL_SQLITE")
-        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian"))
-            available = false; // In Symbian we only support system sqlite option
-        else
         available = true; // Built in, we have a fork
     else if (part == "SQL_SQLITE_LIB") {
         if (dictionary[ "SQL_SQLITE_LIB" ] == "system") {
-            // Symbian has multiple .lib/.dll files we need to find
-            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-                available = true; // There is sqlite_symbian plugin which exports the necessary stuff
-                dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3";
-            } else {
             available = findFile("sqlite3.h") && findFile("sqlite3.lib");
             if (available)
                 dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
-            }
         } else
             available = true;
     } else if (part == "SQL_SQLITE2")
@@ -2163,9 +2030,6 @@ bool Configure::checkAvailability(const QString &part)
     else if (part == "XMLPATTERNS")
         available = dictionary.value("EXCEPTIONS") == "yes";
     else if (part == "PHONON") {
-        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-            available = true;
-        } else {
         available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h")
             && (findFile("strmiids.lib") || findFile("libstrmiids.a"))
             && (findFile("dmoguids.lib") || findFile("libdmoguids.a"))
@@ -2183,7 +2047,6 @@ bool Configure::checkAvailability(const QString &part)
             if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl;
             if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl;
         }
-        }
     } else if (part == "WMSDK") {
         available = findFile("wmsdk.h");
     } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS" || part == "V8" || part == "DECLARATIVE") {
@@ -2197,50 +2060,6 @@ bool Configure::checkAvailability(const QString &part)
         }
     } else if (part == "AUDIO_BACKEND") {
         available = true;
-        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-            QString epocRoot = Environment::symbianEpocRoot();
-            const QDir epocRootDir(epocRoot);
-            if (epocRootDir.exists()) {
-                QStringList paths;
-                paths << "epoc32/release/armv5/lib/mmfdevsound.dso"
-                      << "epoc32/release/armv5/lib/mmfdevsound.lib"
-                      << "epoc32/release/winscw/udeb/mmfdevsound.dll"
-                      << "epoc32/release/winscw/udeb/mmfdevsound.lib"
-                      << "epoc32/include/mmf/server/sounddevice.h";
-
-                QStringList::iterator i = paths.begin();
-                while (i != paths.end()) {
-                    const QString &path = epocRoot + *i;
-                    if (QFile::exists(path))
-                        i = paths.erase(i);
-                    else
-                        ++i;
-                }
-
-                available = (paths.size() == 0);
-                if (!available) {
-                    if (epocRoot.isEmpty())
-                        epocRoot = "<empty string>";
-                    cout << endl
-                         << "The QtMultimedia audio backend will not be built because required" << endl
-                         << "support for CMMFDevSound was not found in the SDK." << endl
-                         << "The SDK which was examined was located at the following path:" << endl
-                         << "    " << epocRoot << endl
-                         << "The following required files were missing from the SDK:" << endl;
-                    QString path;
-                    foreach (path, paths)
-                        cout << "    " << path << endl;
-                    cout << endl;
-                }
-            } else {
-                cout << endl
-                     << "The SDK root was determined to be '" << epocRoot << "'." << endl
-                     << "This directory was not found, so the SDK could not be checked for" << endl
-                     << "CMMFDevSound support.  The QtMultimedia audio backend will therefore" << endl
-                     << "not be built." << endl << endl;
-                available = false;
-            }
-        }
     } else if (part == "DIRECTWRITE") {
         available = findFile("dwrite.h") && findFile("d2d1.h") && findFile("dwrite.lib");
     }
@@ -2551,9 +2370,6 @@ void Configure::generateOutputVars()
     if (dictionary[ "STYLE_CDE" ] == "yes")
         qmakeStyles += "cde";
 
-    if (dictionary[ "STYLE_S60" ] == "yes")
-        qmakeStyles += "s60";
-
     // Databases ----------------------------------------------------
     if (dictionary[ "SQL_MYSQL" ] == "yes")
         qmakeSql += "mysql";
@@ -2651,10 +2467,6 @@ void Configure::generateOutputVars()
         qtConfig += "egl";
     }
 
-    if (dictionary["S60"] == "yes") {
-        qtConfig += "s60";
-    }
-
      if (dictionary["DIRECTSHOW"] == "yes")
         qtConfig += "directshow";
 
@@ -2790,12 +2602,8 @@ void Configure::generateOutputVars()
         qmakeVars += QString("INCLUDEPATH    += ") + escapeSeparators(qmakeIncludes.join(" "));
     if (!opensslLibs.isEmpty())
         qmakeVars += opensslLibs;
-    else if (dictionary[ "OPENSSL" ] == "linked") {
+    else if (dictionary[ "OPENSSL" ] == "linked")
-        if (dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("symbian"))
-            qmakeVars += QString("OPENSSL_LIBS    = -llibssl -llibcrypto");
-        else
         qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
-        }
     if (!psqlLibs.isEmpty())
         qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
 
@@ -2920,10 +2728,6 @@ void Configure::generateCachefile()
         if (!dictionary["QT_LIBINFIX"].isEmpty())
             moduleStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
 
-        moduleStream << "#Qt for Symbian FPU settings" << endl;
-        if (!dictionary["ARM_FPU_TYPE"].isEmpty()) {
-            moduleStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\"";
-        }
         if (!dictionary["QT_NAMESPACE"].isEmpty()) {
             moduleStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
         }
@@ -2986,14 +2790,6 @@ void Configure::generateCachefile()
         if (dictionary["QPA"] == "yes")
             configStream << " qpa";
 
-        if (dictionary.contains("SYMBIAN_DEFFILES")) {
-            if (dictionary["SYMBIAN_DEFFILES"] == "yes") {
-                configStream << " def_files";
-            } else if (dictionary["SYMBIAN_DEFFILES"] == "no") {
-                configStream << " def_files_disabled";
-            }
-        }
-
         if (dictionary["DIRECTWRITE"] == "yes")
             configStream << "directwrite";
 
@@ -3120,7 +2916,10 @@ void Configure::generateConfigfiles()
         if (dictionary["STYLE_WINDOWSVISTA"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSVISTA";
         if (dictionary["STYLE_MOTIF"] != "yes")       qconfigList += "QT_NO_STYLE_MOTIF";
         if (dictionary["STYLE_CDE"] != "yes")         qconfigList += "QT_NO_STYLE_CDE";
-        if (dictionary["STYLE_S60"] != "yes")         qconfigList += "QT_NO_STYLE_S60";
+
+        // ### We still need the QT_NO_STYLE_S60 define for compiling Qt. Remove later!
+        qconfigList += "QT_NO_STYLE_S60";
+
         if (dictionary["STYLE_WINDOWSCE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSCE";
         if (dictionary["STYLE_WINDOWSMOBILE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSMOBILE";
         if (dictionary["STYLE_GTK"] != "yes")         qconfigList += "QT_NO_STYLE_GTK";
@@ -3152,7 +2951,6 @@ void Configure::generateConfigfiles()
         if (dictionary["SCRIPT"] == "no")            qconfigList += "QT_NO_SCRIPT";
         if (dictionary["SCRIPTTOOLS"] == "no")       qconfigList += "QT_NO_SCRIPTTOOLS";
         if (dictionary["FREETYPE"] == "no")          qconfigList += "QT_NO_FREETYPE";
-        if (dictionary["S60"] == "no")               qconfigList += "QT_NO_S60";
         if (dictionary["NATIVE_GESTURES"] == "no")   qconfigList += "QT_NO_NATIVE_GESTURES";
 
         if (dictionary["OPENGL_ES_CM"] == "no" &&
@@ -3179,15 +2977,6 @@ void Configure::generateConfigfiles()
         if (dictionary["GRAPHICS_SYSTEM"] == "raster")  qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
         if (dictionary["GRAPHICS_SYSTEM"] == "runtime") qconfigList += "QT_GRAPHICSSYSTEM_RUNTIME";
 
-        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
-            // These features are not ported to Symbian (yet)
-            qconfigList += "QT_NO_CRASHHANDLER";
-            qconfigList += "QT_NO_PRINTER";
-            qconfigList += "QT_NO_SYSTEMTRAYICON";
-            if (dictionary.contains("QT_LIBINFIX"))
-                tmpStream << QString("#define QT_LIBINFIX \"%1\"").arg(dictionary["QT_LIBINFIX"]) << endl;
-        }
-
         qconfigList.sort();
         for (int i = 0; i < qconfigList.count(); ++i)
             tmpStream << addDefine(qconfigList.at(i));
@@ -3463,8 +3252,7 @@ void Configure::displayConfig()
     cout << "    Motif..................." << dictionary[ "STYLE_MOTIF" ] << endl;
     cout << "    CDE....................." << dictionary[ "STYLE_CDE" ] << endl;
     cout << "    Windows CE.............." << dictionary[ "STYLE_WINDOWSCE" ] << endl;
-    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl;
+    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl << endl;
-    cout << "    S60....................." << dictionary[ "STYLE_S60" ] << endl << endl;
 
     cout << "Sql Drivers:" << endl;
     cout << "    ODBC...................." << dictionary[ "SQL_ODBC" ] << endl;
@@ -3496,18 +3284,6 @@ void Configure::displayConfig()
         cout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl;
     }
 
-    if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("symbian"))) {
-        cout << "Support for S60............." << dictionary[ "S60" ] << endl;
-    }
-
-    if (dictionary.contains("SYMBIAN_DEFFILES")) {
-        cout << "Symbian DEF files enabled..." << dictionary[ "SYMBIAN_DEFFILES" ] << endl;
-        if (dictionary["SYMBIAN_DEFFILES"] == "no") {
-            cout << "WARNING: Disabling DEF files will mean that Qt is NOT binary compatible with previous versions." << endl;
-            cout << "         This feature is only intended for use during development, NEVER for release builds." << endl;
-        }
-    }
-
     if (dictionary["ASSISTANT_WEBKIT"] == "yes")
         cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;
 
@@ -3899,9 +3675,6 @@ void Configure::showSummary()
              << "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl
              << "\t" << qPrintable(make) << endl
              << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
-    } else { // Compiling for Symbian OS
-        cout << endl << endl << "Qt is now configured for building. To start the build run:" << qPrintable(dictionary["QTBUILDINSTRUCTION"]) << "." << endl
-        << "To reconfigure, run '" << qPrintable(dictionary["CONFCLEANINSTRUCTION"]) << "' and configure." << endl;
     }
 }
 
@@ -4026,8 +3799,6 @@ void Configure::readLicense()
    if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h") &&
        (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
         dictionary["PLATFORM NAME"] = "Qt for Windows CE";
-    else if (dictionary.value("XQMAKESPEC").startsWith("symbian"))
-        dictionary["PLATFORM NAME"] = "Qt for Symbian";
     else
         dictionary["PLATFORM NAME"] = "Qt for Windows";
     dictionary["LICENSE FILE"] = sourcePath;

tools/configure/environment.cpp

@@ -60,7 +60,6 @@ using namespace std;
 #include <qt_windows.h>
 #endif
 
-#include <symbian/epocroot_p.h> // from tools/shared
 #include <windows/registry_p.h> // from tools/shared
 
 QT_BEGIN_NAMESPACE
@@ -507,10 +506,4 @@ bool Environment::rmdir(const QString &name)
     return result;
 }
 
-QString Environment::symbianEpocRoot()
-{
-    // Call function defined in tools/shared/symbian/epocroot_p.h
-    return ::qt_epocRoot();
-}
-
 QT_END_NAMESPACE

tools/configure/environment.h

@@ -70,8 +70,6 @@ public:
                       const QString &includeSrcDir = QString());
     static bool rmdir(const QString &name);
 
-    static QString symbianEpocRoot();
-
 private:
     static Compiler detectedCompiler;
 

tools/configure/tools.cpp

@@ -184,11 +184,6 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString
             && platformCode != PL('S', 'C') && platformCode != PL('S', 'U')
             && platformCode != PL('S', 'W') && platformCode != PL('K', 'M')) {
             dictionary["DONE"] = "error";
-        } else if (dictionary["PLATFORM NAME"].contains("Symbian")
-                   && platformCode != PL('N', '9') && platformCode != PL('S', '9')
-                   && platformCode != PL('S', 'C') && platformCode != PL('S', 'U')
-                   && platformCode != PL('S', 'W')) {
-            dictionary["DONE"] = "error";
         }
         break;
     case PL('R', 'M'):