diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
| commit | 25eb97d2d450fbfe761559f1ae87a2e88c8c6b2d (patch) | |
| tree | a96380908abb944ff374201321fa5a50d15b770a /tests/auto/corelib/io/qtemporaryfile | |
| parent | fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f (diff) | |
| parent | 0d6b4b519272915c2690ee12d1834823747233ab (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
src/network/ssl/qsslsocket_openssl.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024
Diffstat (limited to 'tests/auto/corelib/io/qtemporaryfile')
| -rw-r--r-- | tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp index 67d8c55b04..00417fffa0 100644 --- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp @@ -569,13 +569,7 @@ void tst_QTemporaryFile::rename() void tst_QTemporaryFile::renameFdLeak() { -#ifdef Q_OS_UNIX - -# if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) - ChdirOnReturn cor(QDir::currentPath()); - QDir::setCurrent(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)); -# endif - +#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) const QByteArray sourceFile = QFile::encodeName(QFINDTESTDATA(__FILE__)); QVERIFY(!sourceFile.isEmpty()); // Test this on Unix only |