summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-03-29 08:23:26 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-03-29 08:23:26 (GMT)
commitc66ffc1033a11390028a562007fe10f0f2bb870d (patch)
treee3d561878329431d074add9ad8ff9a9dfdffa8bb /tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
parenteaab529d00ce6bd65ca44a4ae4edbf4128b844a6 (diff)
parent7884b913c006402eded0bfe36053c9c557d8d9d6 (diff)
downloadQt-c66ffc1033a11390028a562007fe10f0f2bb870d.zip
Qt-c66ffc1033a11390028a562007fe10f0f2bb870d.tar.gz
Qt-c66ffc1033a11390028a562007fe10f0f2bb870d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 5a2591f..2ce493b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -174,7 +174,7 @@ private:
QVERIFY(component.errors().isEmpty()); \
} else { \
QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \
- QVERIFY(file.open(QIODevice::ReadOnly)); \
+ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \
QByteArray data = file.readAll(); \
file.close(); \
QList<QByteArray> expected = data.split('\n'); \