diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2011-12-21 10:40:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 13:20:40 +0100 |
| commit | d868c9945a188d6ad22e0b7d6d24ac7fca00ab4e (patch) | |
| tree | 0c09d67067b462a0b283fd6680e8847ebad46f8e /tests/auto/corelib/tools/qstring | |
| parent | c02ca6752a1b6cb7d427e59594a600de3a46697d (diff) | |
Remove QT_NO_STL_WCHAR hack
We don't support gcc 2.95 any more.
Change-Id: I842f1f8ac64b9006516c104add0991830ac9a46a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools/qstring')
| -rw-r--r-- | tests/auto/corelib/tools/qstring/tst_qstring.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp index 80cbabeaf6..80e9984690 100644 --- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp @@ -811,9 +811,6 @@ void tst_QString::constructorQByteArray() void tst_QString::STL() { -#ifdef Q_CC_HPACC - QSKIP("This test crashes on HP-UX with aCC"); -#endif #ifndef QT_NO_STL #ifndef QT_NO_CAST_TO_ASCII QString qt( "QString" ); @@ -851,16 +848,13 @@ void tst_QString::STL() QVERIFY( !stdstr3.length() ); #endif -// Skip the rest of the test if glibc is not compiled with wide character support -#if !(defined Q_CC_GNU && !defined _GLIBCPP_USE_WCHAR_T) && !defined QT_NO_STL_WCHAR const wchar_t arr[] = {'h', 'e', 'l', 'l', 'o', 0}; - QStdWString stlStr = arr; + std::wstring stlStr = arr; QString s = QString::fromStdWString(stlStr); QCOMPARE(s, QString::fromLatin1("hello")); QCOMPARE(stlStr, s.toStdWString()); -#endif #else QSKIP( "Not tested without STL support"); #endif |