Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e

1 files changed, 3 insertions, 6 deletions

diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index e7a022bdec..e969724117 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -109,14 +109,11 @@ void tst_QMimeDatabase::initTestCase()
     if (m_testSuite.isEmpty())
         qWarning("%s", qPrintable(testSuiteWarning()));
 
+    const QString errorMessage = QString::fromLatin1("Cannot find '%1'");
     m_yastMimeTypes = QLatin1String(RESOURCE_PREFIX) + yastFileName;
-    QVERIFY2(!m_yastMimeTypes.isEmpty(),
-             qPrintable(QString::fromLatin1("Cannot find '%1' starting from '%2'").
-                        arg(yastFileName, QDir::currentPath())));
+    QVERIFY2(QFile::exists(m_yastMimeTypes), qPrintable(errorMessage.arg(yastFileName)));
     m_qmlAgainFileName = QLatin1String(RESOURCE_PREFIX) + qmlAgainFileName;
-    QVERIFY2(!m_qmlAgainFileName.isEmpty(),
-             qPrintable(QString::fromLatin1("Cannot find '%1' starting from '%2'").
-                        arg(qmlAgainFileName, QDir::currentPath())));
+    QVERIFY2(QFile::exists(m_qmlAgainFileName), qPrintable(errorMessage.arg(qmlAgainFileName)));
 
     init();
 }