--- a/tests/auto/qtextstream/tst_qtextstream.cpp Tue Feb 02 00:43:10 2010 +0200
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp Wed Mar 31 11:06:36 2010 +0300
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -4308,10 +4308,15 @@
// ------------------------------------------------------------------------------
// 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