1 files changed, 6 insertions, 42 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index b9e5fd93e1..cd8634ad04 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -68,11 +68,6 @@ extern "C" DWORD GetThreadLocale(void) {
 #    include <stdlib.h>
 #endif
 
-#if defined(Q_OS_SYMBIAN)
-#    include <e32std.h>
-#    include <private/qcore_symbian_p.h>
-#endif
-
 Q_DECLARE_METATYPE(qlonglong)
 Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QLocale::FormatType)
@@ -135,9 +130,6 @@ private slots:
     void queryDateTime();
     void queryMeasureSystem_data();
     void queryMeasureSystem();
-#if defined(Q_OS_SYMBIAN)
-    void symbianSystemLocale();
-#endif
 
     void ampm();
     void currency();
@@ -371,8 +363,8 @@ void tst_QLocale::ctor()
 
 void tst_QLocale::emptyCtor()
 {
-#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
-    QSKIP("Uses unsupported Windows CE / Symbian QProcess functionality (std streams, env)", SkipAll);
+#if defined(Q_OS_WINCE)
+    QSKIP("Uses unsupported Windows CE QProcess functionality (std streams, env)", SkipAll);
 #endif
 #if defined(QT_NO_PROCESS)
     QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll);
@@ -1885,7 +1877,7 @@ void tst_QLocale::systemMeasurementSystems()
     // Theoretically, we could include HPUX in this test, but its setenv implementation
     // stinks. It's called putenv, and it requires you to keep the variable you pass
     // to it around forever.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     QFETCH(QString, lcAllLocale);
     QFETCH(QString, lcMeasurementLocale);
     QFETCH(QString, langLocale);
@@ -1909,7 +1901,7 @@ void tst_QLocale::systemMeasurementSystems()
     qputenv("LC_MEASUREMENT", oldLcMeasurement.toLocal8Bit());
     qputenv("LANG", oldLang.toLocal8Bit());
 #else
-    QSKIP("Test doesn't work on Mac, Windows or Symbian", SkipAll);
+    QSKIP("Test doesn't work on Mac or Windows", SkipAll);
 #endif
 }
 
@@ -2008,7 +2000,7 @@ void tst_QLocale::queryMeasureSystem()
     // Theoretically, we could include HPUX in this test, but its setenv implementation
     // stinks. It's called putenv, and it requires you to keep the variable you pass
     // to it around forever.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     QFETCH(QString, lcAllLocale);
     QFETCH(QString, lcMeasurementLocale);
     QFETCH(QString, langLocale);
@@ -2032,7 +2024,7 @@ void tst_QLocale::queryMeasureSystem()
     qputenv("LC_MEASUREMENT", oldLcMeasurement.toLocal8Bit());
     qputenv("LANG", oldLang.toLocal8Bit());
 #else
-    QSKIP("Test doesn't work on Mac, Windows or Symbian", SkipAll);
+    QSKIP("Test doesn't work on Mac or Windows", SkipAll);
 #endif
 }
 #endif // QT_NO_SYSTEMLOCALE
@@ -2153,34 +2145,6 @@ void tst_QLocale::standaloneMonthName()
     QCOMPARE(ru.standaloneMonthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257"));
 }
 
-#if defined(Q_OS_SYMBIAN)
-void tst_QLocale::symbianSystemLocale()
-{
-# if defined(__SERIES60_31__)
-    QSKIP("S60 3.1 doesn't support system format properly", SkipAll);
-# else
-    // Simple test to verify that Symbian system locale works at all
-    const QSystemLocale locale;
-    TExtendedLocale s60Locale;
-    s60Locale.LoadSystemSettings();
-
-    TTime s60Date(_L("20090117:")); // Symbian offsets day and month from zero
-    QDate date(2009,2,18);
-
-    TPtrC s60DateFormat = s60Locale.GetShortDateFormatSpec();
-    QString dateFormat = locale.query(QSystemLocale::DateFormatShort, QVariant()).toString();
-
-    TBuf<50> s60FormattedDate;
-    TRAPD(err, s60Date.FormatL(s60FormattedDate, s60DateFormat));
-    QVERIFY(err == KErrNone);
-    QString s60FinalResult = qt_TDesC2QString(s60FormattedDate);
-    QString finalResult = date.toString(dateFormat);
-
-    QCOMPARE(finalResult, s60FinalResult);
-# endif
-}
-#endif
-
 void tst_QLocale::currency()
 {
     const QLocale c(QLocale::C);