diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-08 12:38:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 17:10:15 +0200 |
| commit | e7c58919275b35b2b970f38ed6d23fcf3b715380 (patch) | |
| tree | 56fc631a636ec886fc30a05d324155ad8568a908 /tests/auto/corelib/codecs | |
| parent | f14e2686949bf969c2b0da76816b71a7167089f9 (diff) | |
don't test Qt::codecForHtml() - build with -no-gui
the function is a trivial wrapper for the QTextCodec one, so there is
little point in explicitly testing it.
Change-Id: I0c4950e5a54b7ffff9ba73a001cedb517497a596
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/codecs')
| -rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/test/test.pro b/tests/auto/corelib/codecs/qtextcodec/test/test.pro index ba16a75604..35b2b34690 100644 --- a/tests/auto/corelib/codecs/qtextcodec/test/test.pro +++ b/tests/auto/corelib/codecs/qtextcodec/test/test.pro @@ -1,6 +1,6 @@ CONFIG += testcase CONFIG += parallel_test -QT += testlib +QT = core testlib SOURCES = ../tst_qtextcodec.cpp TARGET = ../tst_qtextcodec diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 6329160998..dd557b8d21 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -44,7 +44,6 @@ #include <qtextcodec.h> #include <qfile.h> -#include <qtextdocument.h> #include <time.h> #include <qprocess.h> #include <QThreadPool> @@ -288,7 +287,7 @@ void tst_QTextCodec::toUnicode_codecForHtml() QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); - QTextCodec *codec = Qt::codecForHtml(data); + QTextCodec *codec = QTextCodec::codecForHtml(data); codec->toUnicode(data); // this line crashes } |