diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp index 5908c335c2..f47c02f93d 100644 --- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp @@ -56,6 +56,8 @@ public: protected: bool event(QEvent *event); private slots: + void initTestCase(); + void load(); void load2(); void threadLoad(); @@ -76,6 +78,14 @@ tst_QTranslator::tst_QTranslator() hide(); } +void tst_QTranslator::initTestCase() +{ + // chdir into the directory containing our testdata, + // to make the code simpler (load testdata via relative paths) + QString testdata_dir = QFileInfo(QFINDTESTDATA("hellotr_la.qm")).absolutePath(); + QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir)); +} + bool tst_QTranslator::event(QEvent *event) { if (event->type() == QEvent::LanguageChange) @@ -228,10 +238,11 @@ void tst_QTranslator::loadFromResource() void tst_QTranslator::loadDirectory() { - QVERIFY(QFileInfo("../qtranslator").isDir()); + QString current_base = QDir::current().dirName(); + QVERIFY(QFileInfo("../" + current_base).isDir()); QTranslator tor; - tor.load("qtranslator", ".."); + tor.load(current_base, ".."); QVERIFY(tor.isEmpty()); } |