diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /tests/auto/other/languagechange/tst_languagechange.cpp | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'tests/auto/other/languagechange/tst_languagechange.cpp')
-rw-r--r-- | tests/auto/other/languagechange/tst_languagechange.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp index 7658aaa8e0..493e279e18 100644 --- a/tests/auto/other/languagechange/tst_languagechange.cpp +++ b/tests/auto/other/languagechange/tst_languagechange.cpp @@ -276,7 +276,7 @@ void tst_languageChange::retranslatability() tempDirPattern += QStringLiteral("languagechangetestdirXXXXXX"); QTemporaryDir temporaryDir(tempDirPattern); temporaryDir.setAutoRemove(true); - QVERIFY(temporaryDir.isValid()); + QVERIFY2(temporaryDir.isValid(), qPrintable(temporaryDir.errorString())); const QString finalDir = temporaryDir.path() + QStringLiteral("/finaldir"); const QString fooName = temporaryDir.path() + QStringLiteral("/foo"); QDir dir; |