summaryrefslogtreecommitdiffstats
path: root/tests/auto/linguist/lconvert
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-12 10:31:15 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-12 12:59:57 (GMT)
commitfae182ebe716cf805805564af95fd2d4c73ae20e (patch)
treea1b9be373210485863e0f7a9f6f9a4916f658023 /tests/auto/linguist/lconvert
parent91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee (diff)
downloadQt-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/lconvert')
-rw-r--r--tests/auto/linguist/lconvert/tst_lconvert.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index e38e22c..10098a4 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -105,7 +105,7 @@ void tst_lconvert::doCompare(QIODevice *actualDev, const QString &expectedFn)
QList<QByteArray> actual = actualDev->readAll().split('\n');
QFile file(expectedFn);
- QVERIFY(file.open(QIODevice::ReadOnly));
+ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
QList<QByteArray> expected = file.readAll().split('\n');
int i = 0, ei = expected.size(), gi = actual.size();
@@ -179,7 +179,7 @@ void tst_lconvert::convertChain(const QString &_inFileName, const QString &_outF
if (!argList.isEmpty())
args += argList[i];
args << "-if" << stations[i] << "-i" << "-" << "-of" << stations[i + 1];
- cvts.at(i)->start(binDir + "/lconvert", args);
+ cvts.at(i)->start(binDir + "/lconvert", args, QIODevice::ReadWrite | QIODevice::Text);
}
int st = 0;
foreach (QProcess *cvt, cvts)
@@ -243,7 +243,9 @@ void tst_lconvert::converts()
QString outFileNameFq = dataDir + outFileName;
QProcess cvt;
- cvt.start(binDir + "/lconvert", QStringList() << "-i" << (dataDir + inFileName) << "-of" << format);
+ cvt.start(binDir + "/lconvert",
+ QStringList() << "-i" << (dataDir + inFileName) << "-of" << format,
+ QIODevice::ReadWrite | QIODevice::Text);
doWait(&cvt, 0);
if (QTest::currentTestFailed())
return;