Fix tests of QMimeDatabase.

- Use temporary directories to avoid instabilities
  due to remains of previous failed tests and locked
  directories.
- Replace SRCDIR by QFINDTESTDATA(), reference only
  the freedesktop.org.xml contained in the Qt source
  tree by $$QT.corelib.sources.
- Improve some error messages, test suite instructions
  for Windows.

Change-Id: Idee8e3767ef0a8299df3bdaaac20334164878db0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: David Faure <faure@kde.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
index 869990401c..94baf77ee9 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
@@ -43,6 +43,7 @@
 #define TST_QMIMEDATABASE_H
 
 #include <QtCore/QObject>
+#include <QtCore/QTemporaryDir>
 
 class tst_QMimeDatabase : public QObject
 {
@@ -53,7 +54,6 @@ public:
 
 private slots:
     void initTestCase();
-    void cleanupTestCase();
 
     void mimeTypeForName();
     void mimeTypeForFileName_data();
@@ -93,7 +93,13 @@ private slots:
     void installNewLocalMimeType();
 
 private:
-    QString m_dataHome;
+    void init(); // test-specific
+
+    QString m_globalXdgDir;
+    QString m_localXdgDir;
+    QString m_yastMimeTypes;
+    QTemporaryDir m_temporaryDir;
+    QString m_testSuite;
 };
 
 #endif   // TST_QMIMEDATABASE_H