diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-12 10:31:15 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-12 12:59:57 (GMT) |
commit | fae182ebe716cf805805564af95fd2d4c73ae20e (patch) | |
tree | a1b9be373210485863e0f7a9f6f9a4916f658023 /tests/auto/linguist/lrelease/tst_lrelease.cpp | |
parent | 91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee (diff) | |
download | Qt-fae182ebe716cf805805564af95fd2d4c73ae20e.zip Qt-fae182ebe716cf805805564af95fd2d4c73ae20e.tar.gz Qt-fae182ebe716cf805805564af95fd2d4c73ae20e.tar.bz2 |
remove dependency on git line end conversions
consistently use QIODevice::Text
Diffstat (limited to 'tests/auto/linguist/lrelease/tst_lrelease.cpp')
-rw-r--r-- | tests/auto/linguist/lrelease/tst_lrelease.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp index 9a3bba6..9d30fe7 100644 --- a/tests/auto/linguist/lrelease/tst_lrelease.cpp +++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp @@ -70,8 +70,8 @@ private: void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedFn) { QFile file(expectedFn); - QVERIFY(file.open(QIODevice::ReadOnly)); - QStringList expected = QString(file.readAll()).trimmed().remove('\r').split('\n'); + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); + QStringList expected = QString(file.readAll()).trimmed().split('\n'); int i = 0, ei = expected.size(), gi = actual.size(); for (; ; i++) { @@ -200,10 +200,10 @@ void tst_lrelease::compressed() void tst_lrelease::dupes() { QProcess proc; - proc.start(binDir + "/lrelease testdata/dupes.ts"); + proc.start(binDir + "/lrelease testdata/dupes.ts", QIODevice::ReadWrite | QIODevice::Text); QVERIFY(proc.waitForFinished()); QVERIFY(proc.exitStatus() == QProcess::NormalExit); - doCompare(QString(proc.readAllStandardError()).trimmed().remove('\r').split('\n'), "testdata/dupes.errors"); + doCompare(QString(proc.readAllStandardError()).trimmed().split('\n'), "testdata/dupes.errors"); } QTEST_MAIN(tst_lrelease) |