summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorOlli Kauppila <olkauppi@.it.local>2012-01-12 13:16:50 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:12 (GMT)
commit767155c48f9a561a330761dc0ea0839290d1a181 (patch)
treeb3547bfef0a6b47c4e4f9dc83d3a9fe492c35131 /tests/auto
parente69d789858db4c8f15543dbf2795fc996139c146 (diff)
downloadQt-767155c48f9a561a330761dc0ea0839290d1a181.zip
Qt-767155c48f9a561a330761dc0ea0839290d1a181.tar.gz
Qt-767155c48f9a561a330761dc0ea0839290d1a181.tar.bz2
Test didn't work after fixed bug QTBUG-17873.
Error received from application didn't match with expected error from baseline file. Fix removes lines "QPixmap: Cannot create a QPixmap when no GUI is being used" from received error message.
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/uic3/tst_uic3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp
index 6e7de4e..e7ca689 100644
--- a/tests/auto/uic3/tst_uic3.cpp
+++ b/tests/auto/uic3/tst_uic3.cpp
@@ -153,7 +153,7 @@ void tst_uic3::convert()
}
QCOMPARE(QString(bFile.readAll()), QString(gFile.readAll()));
- QCOMPARE(QString(eFile.readAll()), QString::fromLocal8Bit(errorOutput).remove(QLatin1Char('\r')));
+ QCOMPARE(QString(eFile.readAll()), QString(QString::fromLocal8Bit(errorOutput).remove(QLatin1Char('\r'))).remove("QPixmap: Cannot create a QPixmap when no GUI is being used\n"));
}
void tst_uic3::convert_data() const