diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-12-11 13:42:28 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2016-01-21 05:53:17 +0000 |
| commit | f05c597ae506ea6163394dbb6b70ecc77fae3b3c (patch) | |
| tree | 02a3b3644bd9c0657aed855d7d348d527cdbefce /tests/auto/corelib/io/qdiriterator | |
| parent | f4502fbaf0d31d08bf08f1685f1d7b30735b72b4 (diff) | |
winrt: msvc2015: refactor file handling
msvc2015 reintroduced a couple of functions from the win32 API
towards WinRT.
Enable usage of those and simplify the file system engine.
Furthermore update the autotests.
Change-Id: I9eafffba0ddfd05917c184c4a6b9e166f86d71d9
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'tests/auto/corelib/io/qdiriterator')
| -rw-r--r-- | tests/auto/corelib/io/qdiriterator/qdiriterator.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro index a2429bf2f0..51bfcb36a5 100644 --- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro @@ -5,6 +5,7 @@ SOURCES = tst_qdiriterator.cpp RESOURCES += qdiriterator.qrc TESTDATA += entrylist +contains(CONFIG, builtin_testdata): DEFINES += BUILTIN_TESTDATA wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index 6b1719ad53..554771f4d2 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -42,7 +42,7 @@ #include <QtCore/private/qfsfileengine_p.h> -#if defined(Q_OS_VXWORKS) +#if defined(Q_OS_VXWORKS) || defined(Q_OS_WINRT) #define Q_NO_SYMLINKS #endif @@ -115,6 +115,10 @@ private slots: #ifndef Q_OS_WIN void hiddenDirs_hiddenFiles(); #endif +#ifdef BUILTIN_TESTDATA +private: + QSharedPointer<QTemporaryDir> m_dataDir; +#endif }; void tst_QDirIterator::initTestCase() @@ -141,6 +145,10 @@ void tst_QDirIterator::initTestCase() } testdata_dir += QStringLiteral("/entrylist"); +#elif defined(BUILTIN_TESTDATA) + m_dataDir = QEXTRACTTESTDATA("/"); + QVERIFY2(!m_dataDir.isNull(), qPrintable("Could not extract test data")); + QString testdata_dir = m_dataDir->path(); #else // chdir into testdata directory, then find testdata by relative paths. @@ -217,6 +225,11 @@ void tst_QDirIterator::cleanupTestCase() Q_FOREACH(QString dirName, createdDirectories) currentDir.rmdir(dirName); + +#ifdef Q_OS_WINRT + QDir::setCurrent(QCoreApplication::applicationDirPath()); +#endif // Q_OS_WINRT + } void tst_QDirIterator::iterateRelativeDirectory_data() |