summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-07-22 16:10:29 +0200
committerDavid Faure <david.faure@kdab.com>2015-08-11 09:22:34 +0000
commit3dcabd8c64c6e42c857b550d8dd7cca81f1f4ea2 (patch)
tree0fddd704fc19802022b99ae879b24ec78c0968f8 /tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
parent7f0f6380b132be76e6d5293b7b357918b7cb3d56 (diff)
QMimeDatabase: Run more tests on non-XDG/shared-mime-info platforms
On Windows and OS X, where QStandardPaths does not use XDG_DATA_DIRS/ _HOME and shared-mime-info is not installed, the tests that require additional shared mime info xml files were never run. Mend that by using QStandardPaths' test mode instead of setting XDG_DATA_HOME. Change-Id: I53b75c293c41c4dac63986dcb88972c2b54d5428 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h')
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
index 26def8f290..2e927aa1bc 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h
@@ -46,6 +46,8 @@ public:
private slots:
void initTestCase();
+ void init();
+ void cleanupTestCase();
void mimeTypeForName();
void mimeTypeForFileName_data();
@@ -86,14 +88,15 @@ private slots:
void installNewLocalMimeType();
private:
- void init(); // test-specific
+ void initTestCaseInternal(); // test-specific
QString m_globalXdgDir;
- QString m_localXdgDir;
+ QString m_localMimeDir;
QString m_yastMimeTypes;
QString m_qmlAgainFileName;
QTemporaryDir m_temporaryDir;
QString m_testSuite;
+ bool m_isUsingCacheProvider;
};
#endif // TST_QMIMEDATABASE_H