diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
commit | 27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d (patch) | |
tree | 4be868ec6a0a425044bee84f269cfee3bad7c0e6 /tests/auto/linguist/lconvert/tst_lconvert.cpp | |
parent | 50afd26a657da319bd6e3cff09ac6c8dd44405bf (diff) | |
parent | 61f2b450560887651b3350e63bdd75609e3b6752 (diff) | |
download | Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.zip Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.gz Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.bz2 |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
src/corelib/animation/qabstractanimation.cpp
Diffstat (limited to 'tests/auto/linguist/lconvert/tst_lconvert.cpp')
-rw-r--r-- | tests/auto/linguist/lconvert/tst_lconvert.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp index 10098a4..cf8f5c3 100644 --- a/tests/auto/linguist/lconvert/tst_lconvert.cpp +++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp @@ -213,6 +213,7 @@ void tst_lconvert::readverifies_data() QTest::newRow("relative locations") << "relative.ts" << "ts"; QTest::newRow("message ids") << "msgid.ts" << "ts"; QTest::newRow("length variants") << "variants.ts" << "ts"; + QTest::newRow("qph") << "phrasebook.qph" << "qph"; } void tst_lconvert::readverifies() |