From 7fc2864dc5391096a19c2d5f80695129c24cc303 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 23 Mar 2016 10:25:46 +0100
Subject: QtCore: Remove Windows CE.

Remove QSysInfo::WV_CE_5/6 enumeration values, #ifdef sections for Q_OS_WINCE
and wince .pro file clauses in library, examples and tests.

Task-number: QTBUG-51673
Change-Id: Ib63463445f3a26e04d018b193e4655030002f5f9
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 .../auto/corelib/io/qdiriterator/qdiriterator.pro  |  2 --
 .../corelib/io/qdiriterator/tst_qdiriterator.cpp   | 27 ++++------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

(limited to 'tests/auto/corelib/io/qdiriterator')

diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
index 2d8dfba996..b5ac614ad1 100644
--- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
@@ -7,6 +7,4 @@ RESOURCES += qdiriterator.qrc
 TESTDATA += entrylist
 contains(CONFIG, builtin_testdata): DEFINES += BUILTIN_TESTDATA
 
-wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1
-
 win32: CONFIG += insignificant_test # Crashes on Windows in release builds
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index 9727ccb407..9bba9615ef 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -41,7 +41,7 @@
 #define Q_NO_SYMLINKS
 #endif
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN)
 #  include "../../../network-settings.h"
 #endif
 
@@ -103,7 +103,7 @@ private slots:
     void longPath();
     void dirorder();
     void relativePaths();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN)
     void uncPaths_data();
     void uncPaths();
 #endif
@@ -196,7 +196,7 @@ void tst_QDirIterator::initTestCase()
 #  endif
 #endif
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WIN)
     createDirectory("hiddenDirs_hiddenFiles");
     createFile("hiddenDirs_hiddenFiles/normalFile");
     createFile("hiddenDirs_hiddenFiles/.hiddenFile");
@@ -239,10 +239,8 @@ void tst_QDirIterator::iterateRelativeDirectory_data()
         << QString("entrylist") << QDirIterator::IteratorFlags(0)
         << QDir::Filters(QDir::NoFilter) << QStringList("*")
         << QString(
-#if !defined(Q_OS_WINCE)
                   "entrylist/.,"
                    "entrylist/..,"
-#endif
                    "entrylist/file,"
 #ifndef Q_NO_SYMLINKS
                    "entrylist/linktofile.lnk,"
@@ -257,9 +255,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data()
         << QString("entrylist") << QDirIterator::IteratorFlags(0)
         << QDir::Filters(QDir::AllEntries | QDir::NoDot) << QStringList("*")
         << QString(
-#if !defined(Q_OS_WINCE)
                    "entrylist/..,"
-#endif
                    "entrylist/file,"
 #ifndef Q_NO_SYMLINKS
                    "entrylist/linktofile.lnk,"
@@ -274,9 +270,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data()
         << QString("entrylist") << QDirIterator::IteratorFlags(0)
         << QDir::Filters(QDir::AllEntries | QDir::NoDotDot) << QStringList("*")
         << QString(
-#if !defined(Q_OS_WINCE)
                   "entrylist/.,"
-#endif
                    "entrylist/file,"
 #ifndef Q_NO_SYMLINKS
                    "entrylist/linktofile.lnk,"
@@ -305,12 +299,10 @@ void tst_QDirIterator::iterateRelativeDirectory_data()
         << QString("entrylist") << QDirIterator::IteratorFlags(QDirIterator::Subdirectories | QDirIterator::FollowSymlinks)
         << QDir::Filters(QDir::NoFilter) << QStringList("*")
         << QString(
-#if !defined(Q_OS_WINCE)
                    "entrylist/.,"
                    "entrylist/..,"
                    "entrylist/directory/.,"
                    "entrylist/directory/..,"
-#endif
                    "entrylist/file,"
 #ifndef Q_NO_SYMLINKS
                    "entrylist/linktofile.lnk,"
@@ -345,11 +337,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data()
     QTest::newRow("empty, default")
         << QString("empty") << QDirIterator::IteratorFlags(0)
         << QDir::Filters(QDir::NoFilter) << QStringList("*")
-#if defined(Q_OS_WINCE)
-        << QStringList();
-#else
         << QString("empty/.,empty/..").split(',');
-#endif
 
         QTest::newRow("empty, QDir::NoDotAndDotDot")
             << QString("empty") << QDirIterator::IteratorFlags(0)
@@ -562,13 +550,6 @@ void tst_QDirIterator::longPath()
     while (dir.exists(dirName) || dir.mkdir(dirName)) {
         ++n;
         dirName.append('x');
-#if defined(Q_OS_WINCE) && defined(WINCE_BROKEN_ITERATE)
-        // Some Windows CE devices/emulators are broken.
-        // though one can create directories of length <= 217,
-        // FindNextFile only reports entries until ~ 214.
-        if (n >= 210)
-            break;
-#endif
     }
 
     QDirIterator it(dir.absolutePath(), QDir::NoDotAndDotDot|QDir::Dirs, QDirIterator::Subdirectories);
@@ -606,7 +587,7 @@ void tst_QDirIterator::relativePaths()
     }
 }
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN)
 void tst_QDirIterator::uncPaths_data()
 {
     QTest::addColumn<QString>("dirName");
-- 
cgit v1.2.3