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

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

1 files changed, 177 insertions, 0 deletions

diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
new file mode 100644
index 0000000..783b83d
--- /dev/null
+++ b/src/testlib/qtestelementattribute.cpp
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtTest module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtestelementattribute.h"
+#include <QtCore/qbytearray.h>
+#include <string.h>
+#include <stdlib.h>
+
+QT_BEGIN_NAMESPACE
+
+/*! \enum QTest::AttributeIndex
+  This enum numbers the different tests.
+
+  \value AI_Undefined
+        
+  \value AI_Name
+        
+  \value AI_Result
+        
+  \value AI_Tests
+        
+  \value AI_Failures
+        
+  \value AI_Errors
+        
+  \value AI_Type
+        
+  \value AI_Description
+        
+  \value AI_PropertyValue
+        
+  \value AI_QTestVersion
+        
+  \value AI_QtVersion
+        
+  \value AI_File
+        
+  \value AI_Line
+        
+  \value AI_Metric
+        
+  \value AI_Tag
+        
+  \value AI_Value
+        
+  \value AI_Iterations
+*/
+
+/*! \enum QTest::LogElementType
+  The enum specifies the kinds of test log messages.
+
+  \value LET_Undefined
+
+  \value LET_Property
+
+  \value LET_Properties
+
+  \value LET_Failure
+
+  \value LET_Error
+
+  \value LET_TestCase
+
+  \value LET_TestSuite
+
+  \value LET_Benchmark
+
+  \value LET_SystemError
+*/
+
+QTestElementAttribute::QTestElementAttribute()
+    :attributeValue(0),
+    attributeIndex(QTest::AI_Undefined)
+{
+}
+
+QTestElementAttribute::~QTestElementAttribute()
+{
+    delete[] attributeValue;
+}
+
+const char *QTestElementAttribute::value() const
+{
+    return attributeValue;
+}
+
+const char *QTestElementAttribute::name() const
+{
+    const char *AttributeNames[] =
+    {
+        "name",
+        "result",
+        "tests",
+        "failures",
+        "errors",
+        "type",
+        "description",
+        "value",
+        "qtestversion",
+        "qtversion",
+        "file",
+        "line",
+        "metric",
+        "tag",
+        "value",
+        "iterations"
+    };
+
+    if(attributeIndex != QTest::AI_Undefined)
+        return AttributeNames[attributeIndex];
+
+    return 0;
+}
+
+QTest::AttributeIndex QTestElementAttribute::index() const
+{
+    return attributeIndex;
+}
+
+bool QTestElementAttribute::isNull() const
+{
+    return attributeIndex == QTest::AI_Undefined;
+}
+
+bool QTestElementAttribute::setPair(QTest::AttributeIndex index, const char *value)
+{
+    if(!value)
+        return false;
+
+    delete[] attributeValue;
+
+    attributeIndex = index;
+    attributeValue = qstrdup(value);
+
+    return (attributeValue!=0) ? true:false;
+}
+
+QT_END_NAMESPACE
+