diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-09 13:34:23 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-09 13:34:23 +1000 |
commit | 828ccd1c02796b6bb9439c93d4741596b1a5992e (patch) | |
tree | bbd94e3a005180695b04b335b9bdecfd10823586 /tests | |
parent | d5cf162c3de9c599ac490bcc7954c1b70ef564da (diff) | |
parent | 865ad5053f053c9274973bb07e9f0ca04fd043d3 (diff) |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
symbian - handle path being passed as part of filename in QTranslator
Symbian - fix compile error when default configured
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qtranslator/i18n/hellotr_en.qm | bin | 0 -> 230 bytes | |||
-rw-r--r-- | tests/auto/qtranslator/qtranslator.pro | 1 | ||||
-rw-r--r-- | tests/auto/qtranslator/tst_qtranslator.cpp | 40 |
3 files changed, 39 insertions, 2 deletions
diff --git a/tests/auto/qtranslator/i18n/hellotr_en.qm b/tests/auto/qtranslator/i18n/hellotr_en.qm Binary files differnew file mode 100644 index 0000000000..cc42afe05c --- /dev/null +++ b/tests/auto/qtranslator/i18n/hellotr_en.qm diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro index 5b742f76e9..8ab1fd3eca 100644 --- a/tests/auto/qtranslator/qtranslator.pro +++ b/tests/auto/qtranslator/qtranslator.pro @@ -4,6 +4,7 @@ RESOURCES += qtranslator.qrc wince*|symbian: { addFiles.sources = hellotr_la.qm msgfmt_from_po.qm + addFiles.sources += i18n addFiles.path = . DEPLOYMENT += addFiles } diff --git a/tests/auto/qtranslator/tst_qtranslator.cpp b/tests/auto/qtranslator/tst_qtranslator.cpp index 8e2ed157a4..6f65e6a662 100644 --- a/tests/auto/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/qtranslator/tst_qtranslator.cpp @@ -66,6 +66,10 @@ protected: private slots: void load(); void load2(); + void loadSubdir(); + void loadSubdir2(); + void loadSubdir3(); + void loadSubdir4(); void threadLoad(); void testLanguageChange(); void plural(); @@ -124,6 +128,38 @@ void tst_QTranslator::load2() QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!")); } +void tst_QTranslator::loadSubdir() +{ + QTranslator tor( 0 ); + tor.load("hellotr_en_GB", "i18n"); + QVERIFY(!tor.isEmpty()); + QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!")); +} + +void tst_QTranslator::loadSubdir2() +{ + QTranslator tor( 0 ); + tor.load("i18n/hellotr_en_GB"); + QVERIFY(!tor.isEmpty()); + QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!")); +} + +void tst_QTranslator::loadSubdir3() +{ + QTranslator tor( 0 ); + tor.load(QString(QLatin1String("i18n%1hellotr_en_GB")).arg(QDir::separator())); + QVERIFY(!tor.isEmpty()); + QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!")); +} + +void tst_QTranslator::loadSubdir4() +{ + QTranslator tor( 0 ); + tor.load("./hellotr_en_GB", "i18n"); + QVERIFY(!tor.isEmpty()); + QCOMPARE(tor.translate("QPushButton", "Hello world!"), QString::fromLatin1("Hallo Welt!")); +} + class TranslatorThread : public QThread { void run() { @@ -249,10 +285,10 @@ void tst_QTranslator::loadFromResource() void tst_QTranslator::loadDirectory() { - QVERIFY(QFileInfo("../qtranslator").isDir()); + QVERIFY(QFileInfo("i18n").isDir()); QTranslator tor; - tor.load("qtranslator", ".."); + tor.load("qtranslator", "i18n"); QVERIFY(tor.isEmpty()); } |