diff options
Diffstat (limited to 'tests/auto/qtextcodec/tst_qtextcodec.cpp')
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 9f51805..403a751 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -45,6 +45,7 @@ #include <qtextcodec.h> #include <qfile.h> #include <qtextdocument.h> +#include <time.h> #include <qprocess.h> class tst_QTextCodec : public QObject @@ -278,7 +279,7 @@ void tst_QTextCodec::codecForLocale() QTextCodec *codec = QTextCodec::codecForLocale(); QVERIFY(codec != 0); -#ifdef Q_OS_UNIX +#if defined(Q_OS_UNIX) // get a time string that is locale-encoded QByteArray originalLocaleEncodedTimeString; originalLocaleEncodedTimeString.resize(1024); @@ -310,7 +311,6 @@ void tst_QTextCodec::codecForLocale() } if (!codec2) { QSKIP("Could not find a codec that is not already the codecForLocale()", SkipAll); - return; } // set it, codecForLocale() should return it now @@ -1685,6 +1685,7 @@ void tst_QTextCodec::utfHeaders_data() << (QString(QChar(0xfeff)) + QString::fromLatin1("hel")) << true; + QTest::newRow("utf32 bom be") << QByteArray("UTF-32") << 0 |