diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-22 09:00:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-22 09:00:29 (GMT) |
| commit | 6d23a6d0a2954a4895dd5c1cfade28eab5a2874e (patch) | |
| tree | f2f1709febef96b8eec5fcf5f450abe50759a4c7 /tests/auto/qtextstream/tst_qtextstream.cpp | |
| parent | 746be2ba8d54e2c9803af6a6ba3cc0b6bf1da258 (diff) | |
| parent | e2f90ecdde9550986df1539aa88eb5fc41d939e1 (diff) | |
| download | Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.zip Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.gz Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/qtextstream/tst_qtextstream.cpp')
| -rw-r--r-- | tests/auto/qtextstream/tst_qtextstream.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 8ff6bee..9146be2 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -4308,10 +4308,15 @@ void tst_QTextStream::int_write_with_locale() // ------------------------------------------------------------------------------ // like QTEST_APPLESS_MAIN, but initialising the locale on Unix +#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN) +QT_BEGIN_NAMESPACE +extern bool qt_locale_initialized; +QT_END_NAMESPACE +#endif + int main(int argc, char *argv[]) { #if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN) - extern bool qt_locale_initialized; ::setlocale(LC_ALL, ""); qt_locale_initialized = true; #endif |