Merge commit 'qt/master-stable' into 4.6-merged

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 54 insertions, 2 deletions

diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index 986bde9fab..1846dcb375 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -156,6 +156,9 @@ private Q_SLOTS:
     void setFocusQIODeviceAvoidVariableClash() const;
     void setFocusQIODeviceFailure() const;
     void setFocusQIODeviceTriggerWarnings() const;
+    void setFocusQString() const;
+    void setFocusQStringFailure() const;
+    void setFocusQStringSignature() const;
     void recompilationWithEvaluateToResultFailing() const;
     void secondEvaluationWithEvaluateToResultFailing() const;
     void recompilationWithEvaluateToReceiver() const;
@@ -1895,6 +1898,55 @@ void tst_QXmlQuery::setFocusQIODeviceFailure() const
     }
 }
 
+void tst_QXmlQuery::setFocusQString() const
+{
+    QXmlQuery query;
+
+    /* Basic use of focus. */
+    {
+        QVERIFY(query.setFocus(QLatin1String("<e>textNode</e>")));
+        query.setQuery(QLatin1String("string()"));
+        QVERIFY(query.isValid());
+        QString out;
+        query.evaluateTo(&out);
+        QCOMPARE(out, QString::fromLatin1("textNode\n"));
+    }
+
+    /* Set to a new focus, make sure it changes and works. */
+    {
+        QVERIFY(query.setFocus(QLatin1String("<e>newFocus</e>")));
+        QString out;
+        query.evaluateTo(&out);
+        QCOMPARE(out, QString::fromLatin1("newFocus\n"));
+    }
+}
+
+void tst_QXmlQuery::setFocusQStringFailure() const
+{
+    QXmlQuery query;
+    MessageSilencer silencer;
+
+    query.setMessageHandler(&silencer);
+    QVERIFY(!query.setFocus(QLatin1String("<notWellformed")));
+
+    /* Let's try the slight special case of a null string. */
+    QVERIFY(!query.setFocus(QString()));
+}
+
+void tst_QXmlQuery::setFocusQStringSignature() const
+{
+    QXmlQuery query;
+    MessageSilencer silencer;
+    query.setMessageHandler(&silencer);
+
+    const QString argument;
+    /* We should take a const ref. */
+    query.setFocus(argument);
+
+    /* We should return a bool. */
+    static_cast<bool>(query.setFocus(QString()));
+}
+
 void tst_QXmlQuery::setFocusQIODeviceTriggerWarnings() const
 {
     /* A null pointer. */