Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

3 files changed, 103 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qstl/.gitignore b/tests/auto/corelib/tools/qstl/.gitignore
new file mode 100644
index 0000000000..6e6a885f4f
--- /dev/null
+++ b/tests/auto/corelib/tools/qstl/.gitignore
@@ -0,0 +1 @@
+tst_qstl
diff --git a/tests/auto/corelib/tools/qstl/qstl.pro b/tests/auto/corelib/tools/qstl/qstl.pro
new file mode 100644
index 0000000000..a0c9db1dfc
--- /dev/null
+++ b/tests/auto/corelib/tools/qstl/qstl.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qstl.cpp
+QT = core
+CONFIG += parallel_test
diff --git a/tests/auto/corelib/tools/qstl/tst_qstl.cpp b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
new file mode 100644
index 0000000000..43c318737f
--- /dev/null
+++ b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <qstring.h>
+
+#include <ostream>
+#include <sstream>
+
+class tst_QStl: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void streaming_data();
+    void streaming();
+
+    void concatenate();
+};
+
+
+static inline std::ostream &operator<<(std::ostream &out, const QString &string)
+{
+    out << string.toLocal8Bit().constData();
+    return out;
+}
+
+void tst_QStl::streaming_data()
+{
+    QTest::addColumn<QString>("str");
+
+    QTest::newRow("hello") << "hello";
+    QTest::newRow("empty") << "";
+}
+
+void tst_QStl::streaming()
+{
+    QFETCH(QString, str);
+
+    std::ostringstream buf;
+    buf << str;
+
+    std::string result = buf.str();
+
+    QCOMPARE(QString::fromLatin1(result.data()), str);
+}
+
+void tst_QStl::concatenate()
+{
+    std::ostringstream buf;
+    buf << QLatin1String("Hello ") << QLatin1String("World");
+
+    QCOMPARE(QString::fromLatin1(buf.str().data()), QString("Hello World"));
+}
+
+
+QTEST_APPLESS_MAIN(tst_QStl)
+#include "tst_qstl.moc"