From bb5570082ecbb1494fd39a971f722cc159bf213a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 24 Nov 2015 08:53:27 +0100 Subject: tst_QImageWriter: Use QTemporaryDir. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a temporary directory instead of writing to the test data directory or home path (Android). Change-Id: I6af583e5da91eefb603eaae179e7d789487dc626 Reviewed-by: aavit Reviewed-by: Jędrzej Nowacki Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index 06c775dded..1dd4d69ea8 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -89,6 +89,7 @@ private slots: void saveToTemporaryFile(); private: + QTemporaryDir m_temporaryDir; QString prefix; QString writePrefix; }; @@ -112,14 +113,11 @@ static void initializePadding(QImage *image) void tst_QImageWriter::initTestCase() { + QVERIFY(m_temporaryDir.isValid()); prefix = QFINDTESTDATA("images/"); if (prefix.isEmpty()) QFAIL("Can't find images directory!"); -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) - writePrefix = QDir::homePath(); -#else - writePrefix = prefix; -#endif + writePrefix = m_temporaryDir.path(); } // Testing get/set functions -- cgit v1.2.3