diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
tree | 545dac994ef985cc91d92fa77da21581b6762c86 /tests/auto/gui | |
parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index 4bf79cab05..7a94217641 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -55,9 +55,6 @@ class tst_QImageWriter : public QObject { Q_OBJECT -public: - virtual ~tst_QImageWriter(); - public slots: void initTestCase(); @@ -155,16 +152,6 @@ void tst_QImageWriter::getSetCheck() QCOMPARE(1.1f, obj1.gamma()); } -tst_QImageWriter::~tst_QImageWriter() -{ - QDir dir(prefix); - QStringList filesToDelete = dir.entryList(QStringList() << "gen-*" , QDir::NoDotAndDotDot | QDir::Files); - foreach( QString file, filesToDelete) { - QFile::remove(dir.absoluteFilePath(file)); - } - -} - void tst_QImageWriter::writeImage_data() { QTest::addColumn<QString>("fileName"); |