Merge branch 'master' of git://gitorious.org/qt/qt

49 files changed, 2113 insertions, 155 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index ab09817..58c1b8c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -141,9 +141,17 @@ SUBDIRS += _networkselftest \
            qglobal \
            qgraphicsitem \
            qgraphicsitemanimation \
+           qgraphicslayout \
+           qgraphicslayoutitem \
+           qgraphicslinearlayout \
+           qgraphicsobject \
+           qgraphicspixmapitem \
+	   qgraphicspolygonitem \
+	   qgraphicsproxywidget \
            qgraphicsscene \
            qgraphicsview \
-           qgridlayout \
+           qgraphicswidget \
+	   qgridlayout \
            qgroupbox \
            qguivariant \
            qhash \
@@ -443,6 +451,8 @@ unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \
 
 contains(QT_CONFIG, webkit): SUBDIRS += \
            qwebframe \
-           qwebpage
+           qwebpage \
+           qwebhistoryinterface \
+           qwebelement
 
 SUBDIRS += math3d
diff --git a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index 4d51e89..dd3e396 100644
--- a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/math3d/qquaternion/tst_qquaternion.cpp
index f25f858..5d70e4d 100644
--- a/tests/auto/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/math3d/qquaternion/tst_qquaternion.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/math3d/qvectornd/tst_qvectornd.cpp
index a092fb0..f7d2411 100644
--- a/tests/auto/math3d/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/math3d/qvectornd/tst_qvectornd.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/math3d/shared/math3dincludes.h b/tests/auto/math3d/shared/math3dincludes.h
index 1ac0c08..a77090b 100644
--- a/tests/auto/math3d/shared/math3dincludes.h
+++ b/tests/auto/math3d/shared/math3dincludes.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp
index 11f715a..7ef930f 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/qbrush/tst_qbrush.cpp
@@ -44,6 +44,7 @@
 
 #include "qbrush.h"
 #include <QPainter>
+#include <QBitmap>
 
 #include <qdebug.h>
 
@@ -76,6 +77,7 @@ private slots:
     void textures();
     
     void nullBrush();
+    void isOpaque();
 };
 
 Q_DECLARE_METATYPE(QBrush)
@@ -379,5 +381,14 @@ void tst_QBrush::nullBrush()
     QCOMPARE(brush.color(), QColor(100,0,0));
 }
 
+void tst_QBrush::isOpaque()
+{
+    QBitmap bm(8, 8);
+    bm.fill(Qt::black);
+
+    QBrush brush(bm);
+    QVERIFY(!brush.isOpaque());
+}
+
 QTEST_MAIN(tst_QBrush)
 #include "tst_qbrush.moc"
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 816b2e8..5321348 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -2197,8 +2197,8 @@ void tst_QComboBox::noScrollbar()
     {
         QTableWidget *table = new QTableWidget(2,2);
         QComboBox comboBox;
-        comboBox.setView(table);
         comboBox.setModel(table->model());
+        comboBox.setView(table);
         comboBox.show();
         QTest::qWait(100);
         comboBox.resize(200, comboBox.height());
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 3d7e6f8..cccdd64 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -61,6 +61,7 @@
 #include <qdebug.h>
 
 #include "../network-settings.h"
+#include <private/qfileinfo_p.h>
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -75,6 +76,9 @@ public:
 
 private slots:
     void getSetCheck();
+
+    void copy();
+
     void isFile_data();
     void isFile();
 
@@ -178,6 +182,58 @@ void tst_QFileInfo::getSetCheck()
     QCOMPARE(true, obj1.caching());
 }
 
+static QFileInfoPrivate* getPrivate(QFileInfo &info)
+{
+    return (*reinterpret_cast<QFileInfoPrivate**>(&info));
+}
+
+void tst_QFileInfo::copy()
+{
+    QTemporaryFile *t;
+    t = new QTemporaryFile;
+    t->open();
+    QFileInfo info(t->fileName());
+    QVERIFY(info.exists());
+
+    //copy constructor
+    QFileInfo info2(info);
+    QFileInfoPrivate *privateInfo = getPrivate(info);
+    QFileInfoPrivate *privateInfo2 = getPrivate(info2);
+    QCOMPARE(privateInfo->data, privateInfo2->data);
+
+    //operator =
+    QFileInfo info3 = info;
+    QFileInfoPrivate *privateInfo3 = getPrivate(info3);
+    QCOMPARE(privateInfo->data, privateInfo3->data);
+    QCOMPARE(privateInfo2->data, privateInfo3->data);
+
+    //refreshing info3 will detach it
+    QFile file(info.absoluteFilePath());
+    QVERIFY(file.open(QFile::WriteOnly));
+    QCOMPARE(file.write("JAJAJAA"), qint64(7));
+    file.flush();
+
+    QTest::qWait(250);
+#if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
+    if (QSysInfo::windowsVersion() & QSysInfo::WV_VISTA ||
+                QSysInfo::windowsVersion() & QSysInfo::WV_CE_based)
+        file.close();
+#endif
+#if defined(Q_OS_WINCE)
+    // On Windows CE we need to close the file.
+    // Otherwise the content will be cached and not
+    // flushed to the storage, although we flushed it
+    // manually!!! CE has interim cache, we cannot influence.
+    QTest::qWait(5000);
+#endif
+    info3.refresh();
+    QVERIFY(privateInfo->data != privateInfo3->data);
+    QVERIFY(privateInfo2->data != privateInfo3->data);
+    QCOMPARE(privateInfo->data, privateInfo2->data);
+
+
+}
+
 tst_QFileInfo::tst_QFileInfo()
 {
 }
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 8afdeb4..d2a059a 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -44,6 +44,7 @@
 
 #include <private/qtextcontrol_p.h>
 #include <private/qgraphicsitem_p.h>
+#include <QStyleOptionGraphicsItem>
 #include <QAbstractTextDocumentLayout>
 #include <QBitmap>
 #include <QCursor>
@@ -209,6 +210,7 @@ private slots:
     void opacity_data();
     void opacity();
     void opacity2();
+    void opacityZeroUpdates();
     void itemStacksBehindParent();
     void nestedClipping();
     void nestedClippingTransforms();
@@ -219,8 +221,14 @@ private slots:
     void updateCachedItemAfterMove();
     void deviceTransform_data();
     void deviceTransform();
+    void update();
     void setTransformProperties_data();
     void setTransformProperties();
+    void itemUsesExtendedStyleOption();
+    void itemSendsGeometryChanges();
+    void moveItem();
+    void sorting_data();
+    void sorting();
 
     // task specific tests below me
     void task141694_textItemEnsureVisible();
@@ -231,6 +239,9 @@ private slots:
     void task240400_clickOnTextItem();
     void task243707_addChildBeforeParent();
     void task197802_childrenVisibility();
+
+private:
+    QList<QGraphicsItem *> paintedItems;
 };
 
 void tst_QGraphicsItem::init()
@@ -1790,15 +1801,15 @@ void tst_QGraphicsItem::setMatrix()
     QCOMPARE(rlist.at(2), unrotatedRect); // From post-update      (update current state)
 }
 
-static QList<QGraphicsItem *> paintedItems;
+static QList<QGraphicsItem *> _paintedItems;
 class PainterItem : public QGraphicsItem
 {
 protected:
     QRectF boundingRect() const
     { return QRectF(-10, -10, 20, 20); }
 
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
-    { paintedItems << this; }
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+    { _paintedItems << this; painter->fillRect(boundingRect(), Qt::red); }
 };
 
 void tst_QGraphicsItem::zValue()
@@ -1830,10 +1841,10 @@ void tst_QGraphicsItem::zValue()
     QApplication::sendPostedEvents(); //glib workaround
 #endif
 
-    QVERIFY(!paintedItems.isEmpty());
-    QVERIFY((paintedItems.size() % 4) == 0);
+    QVERIFY(!_paintedItems.isEmpty());
+    QVERIFY((_paintedItems.size() % 4) == 0);
     for (int i = 0; i < 3; ++i)
-        QVERIFY(paintedItems.at(i)->zValue() < paintedItems.at(i + 1)->zValue());
+        QVERIFY(_paintedItems.at(i)->zValue() < _paintedItems.at(i + 1)->zValue());
 }
 
 void tst_QGraphicsItem::shape()
@@ -3726,8 +3737,20 @@ void tst_QGraphicsItem::defaultItemTest_QGraphicsEllipseItem()
 class ItemChangeTester : public QGraphicsRectItem
 {
 public:
-    ItemChangeTester(){}
-    ItemChangeTester(QGraphicsItem *parent) : QGraphicsRectItem(parent) {}
+    ItemChangeTester()
+    { setFlag(ItemSendsGeometryChanges); clear(); }
+    ItemChangeTester(QGraphicsItem *parent) : QGraphicsRectItem(parent)
+    { setFlag(ItemSendsGeometryChanges); clear(); }
+
+    void clear()
+    {
+        itemChangeReturnValue = QVariant();
+        itemSceneChangeTargetScene = 0;
+        changes.clear();
+        values.clear();
+        oldValues.clear();
+    }
+
     QVariant itemChangeReturnValue;
     QGraphicsScene *itemSceneChangeTargetScene;
 
@@ -3928,7 +3951,8 @@ void tst_QGraphicsItem::itemChange()
         QCOMPARE(tester.changes.size(), changeCount);
         QCOMPARE(tester.changes.at(tester.changes.size() - 2), QGraphicsItem::ItemFlagsChange);
         QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemFlagsHaveChanged);
-        QCOMPARE(tester.values.at(tester.values.size() - 2), qVariantFromValue<quint32>(QGraphicsItem::ItemIsSelectable));
+        QVariant expectedFlags = qVariantFromValue<quint32>(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
+        QCOMPARE(tester.values.at(tester.values.size() - 2), expectedFlags);
         QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue<quint32>(QGraphicsItem::ItemIsSelectable));
     }
     {
@@ -5775,19 +5799,84 @@ void tst_QGraphicsItem::opacity2()
     QCOMPARE(grandChild->repaints, 0);
 }
 
+void tst_QGraphicsItem::opacityZeroUpdates()
+{
+    EventTester *parent = new EventTester;
+    EventTester *child = new EventTester(parent);
+
+    child->setPos(10, 10);
+
+    QGraphicsScene scene;
+    scene.addItem(parent);
+
+    class MyGraphicsView : public QGraphicsView
+    { public:
+        int repaints;
+        QRegion paintedRegion;
+        MyGraphicsView(QGraphicsScene *scene) : QGraphicsView(scene), repaints(0) {}
+        void paintEvent(QPaintEvent *e)
+        {
+            ++repaints;
+            paintedRegion += e->region();
+            QGraphicsView::paintEvent(e);
+        }
+        void reset() { repaints = 0; paintedRegion = QRegion(); }
+    };
+
+    MyGraphicsView view(&scene);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(250);
+
+    view.reset();
+    parent->setOpacity(0.0);
+
+    QTest::qWait(200);
+
+    // transforming items bounding rect to view coordinates
+    const QRect childDeviceBoundingRect = child->deviceTransform(view.viewportTransform())
+                                           .mapRect(child->boundingRect()).toRect();
+    const QRect parentDeviceBoundingRect = parent->deviceTransform(view.viewportTransform())
+                                           .mapRect(parent->boundingRect()).toRect();
+
+    QRegion expectedRegion = parentDeviceBoundingRect.adjusted(-2, -2, 2, 2);
+    expectedRegion += childDeviceBoundingRect.adjusted(-2, -2, 2, 2);
+
+    QCOMPARE(view.paintedRegion, expectedRegion);
+}
+
+class StacksBehindParentHelper : public QGraphicsRectItem
+{
+public:
+    StacksBehindParentHelper(QList<QGraphicsItem *> *paintedItems, const QRectF &rect, QGraphicsItem *parent = 0)
+        : QGraphicsRectItem(rect, parent), paintedItems(paintedItems)
+    { }
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        QGraphicsRectItem::paint(painter, option, widget);
+        paintedItems->append(this);
+    }
+
+private:
+    QList<QGraphicsItem *> *paintedItems;
+};
+
 void tst_QGraphicsItem::itemStacksBehindParent()
 {
-    QGraphicsRectItem *parent1 = new QGraphicsRectItem(QRectF(0, 0, 100, 50));
-    QGraphicsRectItem *child11 = new QGraphicsRectItem(QRectF(-10, 10, 50, 50), parent1);
-    QGraphicsRectItem *grandChild111 = new QGraphicsRectItem(QRectF(-20, 20, 50, 50), child11);
-    QGraphicsRectItem *child12 = new QGraphicsRectItem(QRectF(60, 10, 50, 50), parent1);
-    QGraphicsRectItem *grandChild121 = new QGraphicsRectItem(QRectF(70, 20, 50, 50), child12);
+    StacksBehindParentHelper *parent1 = new StacksBehindParentHelper(&paintedItems, QRectF(0, 0, 100, 50));
+    StacksBehindParentHelper *child11 = new StacksBehindParentHelper(&paintedItems, QRectF(-10, 10, 50, 50), parent1);
+    StacksBehindParentHelper *grandChild111 = new StacksBehindParentHelper(&paintedItems, QRectF(-20, 20, 50, 50), child11);
+    StacksBehindParentHelper *child12 = new StacksBehindParentHelper(&paintedItems, QRectF(60, 10, 50, 50), parent1);
+    StacksBehindParentHelper *grandChild121 = new StacksBehindParentHelper(&paintedItems, QRectF(70, 20, 50, 50), child12);
 
-    QGraphicsRectItem *parent2 = new QGraphicsRectItem(QRectF(0, 0, 100, 50));
-    QGraphicsRectItem *child21 = new QGraphicsRectItem(QRectF(-10, 10, 50, 50), parent2);
-    QGraphicsRectItem *grandChild211 = new QGraphicsRectItem(QRectF(-20, 20, 50, 50), child21);
-    QGraphicsRectItem *child22 = new QGraphicsRectItem(QRectF(60, 10, 50, 50), parent2);
-    QGraphicsRectItem *grandChild221 = new QGraphicsRectItem(QRectF(70, 20, 50, 50), child22);
+    StacksBehindParentHelper *parent2 = new StacksBehindParentHelper(&paintedItems, QRectF(0, 0, 100, 50));
+    StacksBehindParentHelper *child21 = new StacksBehindParentHelper(&paintedItems, QRectF(-10, 10, 50, 50), parent2);
+    StacksBehindParentHelper *grandChild211 = new StacksBehindParentHelper(&paintedItems, QRectF(-20, 20, 50, 50), child21);
+    StacksBehindParentHelper *child22 = new StacksBehindParentHelper(&paintedItems, QRectF(60, 10, 50, 50), parent2);
+    StacksBehindParentHelper *grandChild221 = new StacksBehindParentHelper(&paintedItems, QRectF(70, 20, 50, 50), child22);
 
     parent1->setData(0, "parent1");
     child11->setData(0, "child11");
@@ -5809,25 +5898,57 @@ void tst_QGraphicsItem::itemStacksBehindParent()
     scene.addItem(parent1);
     scene.addItem(parent2);
 
+    paintedItems.clear();
+
+    QGraphicsView view(&scene);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(250);
+
     QCOMPARE(scene.items(0, 0, 100, 100), (QList<QGraphicsItem *>()
                                            << grandChild111 << child11
                                            << grandChild121 << child12 << parent1
                                            << grandChild211 << child21
                                            << grandChild221 << child22 << parent2));
+    QCOMPARE(paintedItems, QList<QGraphicsItem *>()
+             << parent2 << child22 << grandChild221
+             << child21 << grandChild211
+             << parent1 << child12 << grandChild121
+             << child11 << grandChild111);
 
     child11->setFlag(QGraphicsItem::ItemStacksBehindParent);
+    scene.update();
+    paintedItems.clear();
+    QTest::qWait(250);
+
     QCOMPARE(scene.items(0, 0, 100, 100), (QList<QGraphicsItem *>()
                                            << grandChild121 << child12 << parent1
                                            << grandChild111 << child11
                                            << grandChild211 << child21
                                            << grandChild221 << child22 << parent2));
+    QCOMPARE(paintedItems, QList<QGraphicsItem *>()
+             << parent2 << child22 << grandChild221
+             << child21 << grandChild211
+             << child11 << grandChild111
+             << parent1 << child12 << grandChild121);
 
     child12->setFlag(QGraphicsItem::ItemStacksBehindParent);
+    paintedItems.clear();
+    scene.update();
+    QTest::qWait(250);
+
     QCOMPARE(scene.items(0, 0, 100, 100), (QList<QGraphicsItem *>()
                                            << parent1 << grandChild111 << child11
                                            << grandChild121 << child12
                                            << grandChild211 << child21
                                            << grandChild221 << child22 << parent2));
+    QCOMPARE(paintedItems, QList<QGraphicsItem *>()
+             << parent2 << child22 << grandChild221
+             << child21 << grandChild211
+             << child12 << grandChild121
+             << child11 << grandChild111 << parent1);
 }
 
 class ClippingAndTransformsScene : public QGraphicsScene
@@ -5876,6 +5997,7 @@ void tst_QGraphicsItem::nestedClipping()
     l3->setData(0, "l3");
 
     QGraphicsView view(&scene);
+    view.setOptimizationFlag(QGraphicsView::IndirectPainting);
     view.show();
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
@@ -6428,6 +6550,71 @@ void tst_QGraphicsItem::deviceTransform()
     QCOMPARE(rect3->deviceTransform(deviceX).map(QPointF(50, 50)), mapResult3);
 }
 
+class MyGraphicsView : public QGraphicsView
+{
+public:
+    int repaints;
+    QRegion paintedRegion;
+    MyGraphicsView(QGraphicsScene *scene) : QGraphicsView(scene), repaints(0) {}
+    void paintEvent(QPaintEvent *e)
+    {
+        paintedRegion += e->region();
+        ++repaints;
+        QGraphicsView::paintEvent(e);
+    }
+    void reset() { repaints = 0; paintedRegion = QRegion(); }
+};
+
+void tst_QGraphicsItem::update()
+{
+    QGraphicsScene scene;
+    MyGraphicsView view(&scene);
+
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(100);
+
+    EventTester *item = new EventTester;
+    scene.addItem(item);
+    QTest::qWait(100); // Make sure all pending updates are processed.
+    item->repaints = 0;
+
+    item->update(); // Item marked as dirty
+    scene.update(); // Entire scene marked as dirty
+    qApp->processEvents();
+    QCOMPARE(item->repaints, 1);
+
+    // Make sure the dirty state from the previous update is reset so that
+    // the item don't think it is already dirty and discards this update.
+    item->update();
+    qApp->processEvents();
+    QCOMPARE(item->repaints, 2);
+
+    // Make sure a partial update doesn't cause a full update to be discarded.
+    view.reset();
+    item->repaints = 0;
+    item->update(QRectF(0, 0, 5, 5));
+    item->update();
+    qApp->processEvents();
+    QCOMPARE(item->repaints, 1);
+    QCOMPARE(view.repaints, 1);
+    const QRect itemDeviceBoundingRect = item->deviceTransform(view.viewportTransform())
+                                         .mapRect(item->boundingRect()).toRect();
+    const QRegion expectedRegion = itemDeviceBoundingRect.adjusted(-2, -2, 2, 2);
+    // The entire item's bounding rect (adjusted for antialiasing) should have been painted.
+    QCOMPARE(view.paintedRegion, expectedRegion);
+
+    // Make sure update requests outside the bounding rect are discarded.
+    view.reset();
+    item->repaints = 0;
+    item->update(-15, -15, 5, 5); // Item's brect: (-10, -10, 20, 20)
+    qApp->processEvents();
+    QCOMPARE(item->repaints, 0);
+    QCOMPARE(view.repaints, 0);
+}
+
 void tst_QGraphicsItem::setTransformProperties_data()
 {
     QTest::addColumn<QPointF>("origin");
@@ -6440,26 +6627,26 @@ void tst_QGraphicsItem::setTransformProperties_data()
     QTest::addColumn<qreal>("shearY");
 
     QTest::newRow("nothing") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
+                                          << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("rotationZ") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(42.2)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
+                                          << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("rotationXY") << QPointF() << qreal(12.5) << qreal(53.6) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
+                                          << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("rotationXYZ") << QPointF() << qreal(-25) << qreal(12) << qreal(556)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
+                                          << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("rotationXYZ dicentred") << QPointF(-53, 25.2) 
                                 << qreal(-2578.2) << qreal(4565.2) << qreal(56)
-                                << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
+                                << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("Scale")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
                                           << qreal(6) << qreal(0.5) << qreal(0.0) << qreal(0.0);
 
     QTest::newRow("Shear")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(2.2) << qreal(0.5);
+                                          << qreal(1.0) << qreal(1.0) << qreal(2.2) << qreal(0.5);
 
     QTest::newRow("Scale and Shear")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
                                           << qreal(5.2) << qreal(2.1) << qreal(5.2) << qreal(5.5);
@@ -6471,6 +6658,11 @@ void tst_QGraphicsItem::setTransformProperties_data()
                                         << qreal(4) << qreal(2) << qreal(2.56) << qreal(0.8);
 }
 
+/**
+ * the normal QCOMPARE doesn't work because it doesn't use qFuzzyCompare
+ */
+#define QCOMPARE_TRANSFORM(X1, X2)   QVERIFY(((X1)*(X2).inverted()).isIdentity())
+
 void tst_QGraphicsItem::setTransformProperties()
 {
     QFETCH(QPointF,origin);
@@ -6494,7 +6686,6 @@ void tst_QGraphicsItem::setTransformProperties()
     QGraphicsScene scene;
     QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 100, 100));
     scene.addItem(item);
-    item->setPos(100, 100);
 
     item->setRotation(rotationX, rotationY, rotationZ);
     item->setScale(scaleX, scaleY);
@@ -6510,7 +6701,8 @@ void tst_QGraphicsItem::setTransformProperties()
     QCOMPARE(item->verticalShear(), shearY);
     QCOMPARE(item->transformOrigin(), origin);
 
-    QCOMPARE(result, item->transform());
+    QCOMPARE(QTransform(), item->transform());
+    QCOMPARE(result, item->sceneTransform());
 
     //-----------------------------------------------------------------
     //Change the rotation Z
@@ -6533,24 +6725,311 @@ void tst_QGraphicsItem::setTransformProperties()
     QCOMPARE(item->verticalShear(), shearY);
     QCOMPARE(item->transformOrigin(), origin);
 
-    QCOMPARE(result2, item->transform());
+    QCOMPARE(QTransform(), item->transform());
+    QCOMPARE(result2, item->sceneTransform());
 
     //-----------------------------------------------------------------
-    // calling setTransform() should reset the properties to their default
+    // calling setTransform() and setPos shoukld change the sceneTransform
     item->setTransform(result);
+    item->setPos(100, -150.5);
 
-    QCOMPARE(item->xRotation(), 0.0);
-    QCOMPARE(item->yRotation(), 0.0);
-    QCOMPARE(item->zRotation(), 0.0);
-    QCOMPARE(item->xScale(), 1.0);
-    QCOMPARE(item->yScale(), 1.0);
-    QCOMPARE(item->horizontalShear(), 0.0);
-    QCOMPARE(item->verticalShear(), 0.0);
-    QCOMPARE(item->transformOrigin(), QPointF(0,0));
-
+    QCOMPARE(item->xRotation(), rotationX);
+    QCOMPARE(item->yRotation(), rotationY);
+    QCOMPARE(item->zRotation(), 45.0);
+    QCOMPARE(item->xScale(), scaleX);
+    QCOMPARE(item->yScale(), scaleY);
+    QCOMPARE(item->horizontalShear(), shearX);
+    QCOMPARE(item->verticalShear(), shearY);
+    QCOMPARE(item->transformOrigin(), origin);
     QCOMPARE(result, item->transform());
+
+    QTransform result3;
+
+    result3.translate(origin.x(), origin.y());
+    result3 = result * result3;
+    result3.rotate(rotationX, Qt::XAxis);
+    result3.rotate(rotationY, Qt::YAxis);
+    result3.rotate(45, Qt::ZAxis);
+    result3.shear(shearX, shearY);
+    result3.scale(scaleX, scaleY);
+    result3.translate(-origin.x(), -origin.y());
+
+    result3 *= QTransform::fromTranslate(100, -150.5); //the pos;
+
+    QCOMPARE(result3, item->sceneTransform());
+
+    //-----------------------------------------------------
+    // setting the propertiees should be the same as setting a transform
+    {//with center origin on the matrix
+        QGraphicsRectItem *item1 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119));
+        scene.addItem(item1);
+        QGraphicsRectItem *item2 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119));
+        scene.addItem(item2);
+
+        item1->setPos(12.3, -5);
+        item2->setPos(12.3, -5);
+        item1->setRotation(rotationX, rotationY, rotationZ);
+        item1->setScale(scaleX, scaleY);
+        item1->setShear(shearX, shearY);
+        item1->setTransformOrigin(origin);
+
+        item2->setTransform(result);
+
+        QCOMPARE_TRANSFORM(item1->sceneTransform(), item2->sceneTransform());
+
+        QCOMPARE_TRANSFORM(item1->itemTransform(item2), QTransform()); 
+        QCOMPARE_TRANSFORM(item2->itemTransform(item1), QTransform());
+    }
+
+    {//with center origin on the item
+        QGraphicsRectItem *item1 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119));
+        scene.addItem(item1);
+        QGraphicsRectItem *item2 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119));
+        scene.addItem(item2);
+
+        item1->setPos(12.3, -5);
+        item2->setPos(12.3, -5);
+        item1->setTransformOrigin(origin);
+        item2->setTransformOrigin(origin);
+
+        item1->setRotation(rotationX, rotationY, rotationZ);
+        item1->setScale(scaleX, scaleY);
+        item1->setShear(shearX, shearY);
+
+        QTransform tr;
+        tr.rotate(rotationX, Qt::XAxis);
+        tr.rotate(rotationY, Qt::YAxis);
+        tr.rotate(rotationZ, Qt::ZAxis);
+        tr.shear(shearX, shearY);
+        tr.scale(scaleX, scaleY);
+
+        item2->setTransform(tr);
+
+        QCOMPARE_TRANSFORM(item1->sceneTransform(), item2->sceneTransform());
+
+        QCOMPARE_TRANSFORM(item1->itemTransform(item2), QTransform()); 
+        QCOMPARE_TRANSFORM(item2->itemTransform(item1), QTransform());
+    }
 }
 
+class MyStyleOptionTester : public QGraphicsRectItem
+{
+public:
+    MyStyleOptionTester(const QRectF &rect)
+        : QGraphicsRectItem(rect), startTrack(false)
+    {}
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
+    {
+        if (startTrack) {
+            //Doesn't use the extended style option so the exposed rect is the boundingRect
+            if (!(flags() & QGraphicsItem::ItemUsesExtendedStyleOption)) {
+                QCOMPARE(option->exposedRect, boundingRect());
+            } else {
+                QVERIFY(option->exposedRect != QRect());
+                QVERIFY(option->exposedRect != boundingRect());
+            }
+        }
+        QGraphicsRectItem::paint(painter, option, widget);
+    }
+    bool startTrack;
+};
+
+void tst_QGraphicsItem::itemUsesExtendedStyleOption()
+{
+    QGraphicsScene scene(0, 0, 300, 300);
+    QGraphicsPixmapItem item;
+    item.setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
+    QCOMPARE(item.flags(), QGraphicsItem::GraphicsItemFlags(QGraphicsItem::ItemUsesExtendedStyleOption));
+    item.setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, false);
+    QCOMPARE(item.flags(), 0);
+
+    //We now test the content of the style option
+    MyStyleOptionTester *rect = new MyStyleOptionTester(QRect(0, 0, 100, 100));
+    scene.addItem(rect);
+    rect->setPos(200, 200);
+    QGraphicsView view(&scene);
+    QTest::qWait(500);
+    rect->startTrack = true;
+    rect->update(10, 10, 10, 10);
+    QTest::qWait(125);
+    rect->startTrack = false;
+    rect->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
+    QVERIFY((rect->flags() & QGraphicsItem::ItemUsesExtendedStyleOption));
+    QTest::qWait(125);
+    rect->startTrack = true;
+    rect->update(10, 10, 10, 10);
+    QTest::qWait(125);
+}
+
+void tst_QGraphicsItem::itemSendsGeometryChanges()
+{
+    ItemChangeTester item;
+    item.setFlags(0);
+    item.clear();
+
+    QTransform x = QTransform().rotate(45);
+    QPointF pos(10, 10);
+    qreal o(0.5);
+    item.setTransform(x);
+    item.setPos(pos);
+    QCOMPARE(item.transform(), x);
+    QCOMPARE(item.pos(), pos);
+    QCOMPARE(item.changes.size(), 0);
+
+    item.setOpacity(o);
+    QCOMPARE(item.changes.size(), 2); // opacity
+
+    item.setFlag(QGraphicsItem::ItemSendsGeometryChanges);
+    QCOMPARE(item.changes.size(), 4); // flags
+    item.setTransform(QTransform());
+    item.setPos(QPointF());
+    QCOMPARE(item.changes.size(), 8); // transform + pos
+    QCOMPARE(item.transform(), QTransform());
+    QCOMPARE(item.pos(), QPointF());
+    QCOMPARE(item.opacity(), o);
+
+    QCOMPARE(item.changes, QList<QGraphicsItem::GraphicsItemChange>()
+             << QGraphicsItem::ItemOpacityChange
+             << QGraphicsItem::ItemOpacityHasChanged
+             << QGraphicsItem::ItemFlagsChange
+             << QGraphicsItem::ItemFlagsHaveChanged
+             << QGraphicsItem::ItemTransformChange
+             << QGraphicsItem::ItemTransformHasChanged
+             << QGraphicsItem::ItemPositionChange
+             << QGraphicsItem::ItemPositionHasChanged);
+}
+
+// Make sure we update moved items correctly.
+void tst_QGraphicsItem::moveItem()
+{
+    QGraphicsScene scene;
+    scene.setSceneRect(-50, -50, 200, 200);
+
+    MyGraphicsView view(&scene);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(100);
+
+    EventTester *parent = new EventTester;
+    EventTester *child = new EventTester(parent);
+    EventTester *grandChild = new EventTester(child);
+
+#define RESET_COUNTERS \
+    parent->repaints = 0; \
+    child->repaints = 0; \
+    grandChild->repaints = 0; \
+    view.reset();
+
+    scene.addItem(parent);
+    QTest::qWait(100);
+
+    RESET_COUNTERS
+
+    // Item's boundingRect:  (-10, -10, 20, 20).
+    QRect parentDeviceBoundingRect = parent->deviceTransform(view.viewportTransform())
+                                     .mapRect(parent->boundingRect()).toRect()
+                                     .adjusted(-2, -2, 2, 2); // Adjusted for antialiasing.
+
+    parent->setPos(20, 20);
+    qApp->processEvents();
+    QCOMPARE(parent->repaints, 1);
+    QCOMPARE(view.repaints, 1);
+    QRegion expectedParentRegion = parentDeviceBoundingRect; // old position
+    parentDeviceBoundingRect.translate(20, 20);
+    expectedParentRegion += parentDeviceBoundingRect; // new position
+    QCOMPARE(view.paintedRegion, expectedParentRegion);
+
+    RESET_COUNTERS
+
+    child->setPos(20, 20);
+    qApp->processEvents();
+    QCOMPARE(parent->repaints, 1);
+    QCOMPARE(child->repaints, 1);
+    QCOMPARE(view.repaints, 1);
+    const QRegion expectedChildRegion = expectedParentRegion.translated(20, 20);
+    QCOMPARE(view.paintedRegion, expectedChildRegion);
+
+    RESET_COUNTERS
+
+    grandChild->setPos(20, 20);
+    qApp->processEvents();
+    QCOMPARE(parent->repaints, 1);
+    QCOMPARE(child->repaints, 1);
+    QCOMPARE(grandChild->repaints, 1);
+    QCOMPARE(view.repaints, 1);
+    const QRegion expectedGrandChildRegion = expectedParentRegion.translated(40, 40);
+    QCOMPARE(view.paintedRegion, expectedGrandChildRegion);
+
+    RESET_COUNTERS
+
+    parent->translate(20, 20);
+    qApp->processEvents();
+    QCOMPARE(parent->repaints, 1);
+    QCOMPARE(child->repaints, 1);
+    QCOMPARE(grandChild->repaints, 1);
+    QCOMPARE(view.repaints, 1);
+    expectedParentRegion.translate(20, 20);
+    expectedParentRegion += expectedChildRegion.translated(20, 20);
+    expectedParentRegion += expectedGrandChildRegion.translated(20, 20);
+    QCOMPARE(view.paintedRegion, expectedParentRegion);
+}
+
+void tst_QGraphicsItem::sorting_data()
+{
+    QTest::addColumn<int>("index");
+
+    QTest::newRow("NoIndex") << int(QGraphicsScene::NoIndex);
+    QTest::newRow("BspTreeIndex") << int(QGraphicsScene::BspTreeIndex);
+}
+
+void tst_QGraphicsItem::sorting()
+{
+    _paintedItems.clear();
+
+    QGraphicsScene scene;
+    QGraphicsItem *grid[100][100];
+    for (int x = 0; x < 100; ++x) {
+        for (int y = 0; y < 100; ++y) {
+            PainterItem *item = new PainterItem;
+            item->setPos(x * 25, y * 25);
+            item->setData(0, QString("%1x%2").arg(x).arg(y));
+            grid[x][y] = item;
+            scene.addItem(item);
+        }
+    }
+
+    PainterItem *item1 = new PainterItem;
+    PainterItem *item2 = new PainterItem;
+    item1->setData(0, "item1");
+    item2->setData(0, "item2");
+    scene.addItem(item1);
+    scene.addItem(item2);
+
+    QGraphicsView view(&scene);
+    view.setResizeAnchor(QGraphicsView::NoAnchor);
+    view.setTransformationAnchor(QGraphicsView::NoAnchor);
+    view.resize(100, 100);
+    view.setFrameStyle(0);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(100);
+
+    _paintedItems.clear();
+
+    view.viewport()->repaint();
+
+    QCOMPARE(_paintedItems, QList<QGraphicsItem *>()
+                 << grid[0][0] << grid[0][1] << grid[0][2] << grid[0][3]
+                 << grid[1][0] << grid[1][1] << grid[1][2] << grid[1][3]
+                 << grid[2][0] << grid[2][1] << grid[2][2] << grid[2][3]
+                 << grid[3][0] << grid[3][1] << grid[3][2] << grid[3][3]
+                 << item1 << item2);
+}
 
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
new file mode 100644
index 0000000..965b319
--- /dev/null
+++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro
@@ -0,0 +1,2 @@
+load(qttest_p4)
+SOURCES  += tst_qgraphicsobject.cpp
diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
new file mode 100644
index 0000000..eb12c48
--- /dev/null
+++ b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 <QtTest/QtTest>
+#include <qgraphicsitem.h>
+#include <qgraphicsscene.h>
+#include <qgraphicssceneevent.h>
+#include <qgraphicsview.h>
+#include <qstyleoption.h>
+#include "../../shared/util.h"
+
+class tst_QGraphicsObject : public QObject {
+    Q_OBJECT
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+private slots:
+    void pos();
+    void x();
+    void y();
+    void z();
+    void opacity();
+    void enabled();
+    void visible();
+};
+
+
+// This will be called before the first test function is executed.
+// It is only called once.
+void tst_QGraphicsObject::initTestCase()
+{
+}
+
+// This will be called after the last test function is executed.
+// It is only called once.
+void tst_QGraphicsObject::cleanupTestCase()
+{
+}
+
+// This will be called before each test function is executed.
+void tst_QGraphicsObject::init()
+{
+}
+
+// This will be called after every test function.
+void tst_QGraphicsObject::cleanup()
+{
+}
+
+
+class MyGraphicsObject : public QGraphicsObject
+{
+public:
+    MyGraphicsObject() : QGraphicsObject() {}
+    virtual QRectF boundingRect() const { return QRectF(); }
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+};
+
+void tst_QGraphicsObject::pos()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setPos(10, 10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 1);
+
+    QVERIFY(object.pos() == QPointF(10,10));
+
+    object.setPos(10, 10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 1);
+
+    object.setProperty("pos", QPointF(0, 0));
+    QCOMPARE(xSpy.count(), 2);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("pos") == QPointF(0,0));
+
+    object.setProperty("pos", QPointF(10, 0));
+    QCOMPARE(xSpy.count(), 3);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("pos") == QPointF(10,0));
+
+    object.setProperty("pos", QPointF(10, 10));
+    QCOMPARE(xSpy.count(), 3);
+    QCOMPARE(ySpy.count(), 3);
+    QVERIFY(object.property("pos") == QPointF(10, 10));
+}
+
+void tst_QGraphicsObject::x()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setX(10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 0);
+
+    QVERIFY(object.pos() == QPointF(10, 0));
+    QVERIFY(object.x() == 10);
+
+    object.setX(10);
+    QCOMPARE(xSpy.count(), 1);
+    QCOMPARE(ySpy.count(), 0);
+
+    object.setProperty("x", 0);
+    QCOMPARE(xSpy.count(), 2);
+    QCOMPARE(ySpy.count(), 0);
+    QVERIFY(object.property("x") == 0);
+}
+
+void tst_QGraphicsObject::y()
+{
+    MyGraphicsObject object;
+    QSignalSpy xSpy(&object, SIGNAL(xChanged()));
+    QSignalSpy ySpy(&object, SIGNAL(yChanged()));
+    QVERIFY(object.pos() == QPointF(0, 0));
+    object.setY(10);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 1);
+
+    QVERIFY(object.pos() == QPointF(0, 10));
+    QVERIFY(object.y() == 10);
+
+    object.setY(10);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 1);
+
+    object.setProperty("y", 0);
+    QCOMPARE(xSpy.count(), 0);
+    QCOMPARE(ySpy.count(), 2);
+    QVERIFY(object.property("y") == 0);
+}
+
+void tst_QGraphicsObject::z()
+{
+    MyGraphicsObject object;
+    QSignalSpy zSpy(&object, SIGNAL(zChanged()));
+    QVERIFY(object.zValue() == 0);
+    object.setZValue(10);
+    QCOMPARE(zSpy.count(), 1);
+
+    QVERIFY(object.zValue() == 10);
+
+    object.setZValue(10);
+    QCOMPARE(zSpy.count(), 1);
+
+    object.setProperty("z", 0);
+    QCOMPARE(zSpy.count(), 2);
+    QVERIFY(object.property("z") == 0);
+}
+
+void tst_QGraphicsObject::opacity()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(opacityChanged()));
+    QVERIFY(object.opacity() == 1.);
+    object.setOpacity(0);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.opacity() == 0.);
+
+    object.setOpacity(0);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("opacity", .5);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("opacity") == .5);
+}
+
+void tst_QGraphicsObject::enabled()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(enabledChanged()));
+    QVERIFY(object.isEnabled() == true);
+    object.setEnabled(false);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.isEnabled() == false);
+
+    object.setEnabled(false);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("enabled", true);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("enabled") == true);
+}
+
+void tst_QGraphicsObject::visible()
+{
+    MyGraphicsObject object;
+    QSignalSpy spy(&object, SIGNAL(visibleChanged()));
+    QVERIFY(object.isVisible() == true);
+    object.setVisible(false);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(object.isVisible() == false);
+
+    object.setVisible(false);
+    QCOMPARE(spy.count(), 1);
+
+    object.setProperty("visible", true);
+    QCOMPARE(spy.count(), 2);
+    QVERIFY(object.property("visible") == true);
+}
+
+
+QTEST_MAIN(tst_QGraphicsObject)
+#include "tst_qgraphicsobject.moc"
+
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index d856024..fa0e035 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -1487,7 +1487,7 @@ void tst_QGraphicsProxyWidget::scrollUpdate()
 	     QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10));
     QCOMPARE(widget->npaints, 2);
     QCOMPARE(widget->paintEventRegion.rects(),
-	     QVector<QRect>() << QRect(0, 0, 200, 13) << QRect(0, 13, 103, 10));
+             QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10));
 }
 
 void tst_QGraphicsProxyWidget::setWidget_simple()
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 0c5ebf6..8bb9122 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -274,7 +274,9 @@ void tst_QGraphicsScene::sceneRect()
     QCOMPARE(scene.sceneRect(), QRectF());
 
     QGraphicsItem *item = scene.addRect(QRectF(0, 0, 10, 10));
+    qApp->processEvents();
     item->setPos(-5, -5);
+    qApp->processEvents();
 
     QCOMPARE(scene.itemAt(0, 0), item);
     QCOMPARE(scene.itemAt(10, 10), (QGraphicsItem *)0);
@@ -1317,8 +1319,9 @@ void tst_QGraphicsScene::removeItem()
     scene.removeItem(hoverItem);
     hoverItem->setAcceptsHoverEvents(false);
     scene.addItem(hoverItem);
-    qApp->processEvents(); // update
-    qApp->processEvents(); // draw
+    qApp->processEvents(); // <- delayed update is called
+    qApp->processEvents(); // <- scene schedules pending update
+    qApp->processEvents(); // <- pending update is sent to view
     QVERIFY(!hoverItem->isHovered);
 }
 
@@ -2712,6 +2715,7 @@ void tst_QGraphicsScene::update()
 
     QGraphicsRectItem *rect = new QGraphicsRectItem(0, 0, 100, 100);
     scene.addItem(rect);
+    qApp->processEvents();
     rect->setPos(-100, -100);
 
     // This function forces indexing
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 8e490ad..78d09ba 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -188,9 +188,13 @@ private slots:
     void embeddedViews();
     void scrollAfterResize_data();
     void scrollAfterResize();
+    void moveItemWhileScrolling_data();
+    void moveItemWhileScrolling();
     void centerOnDirtyItem();
     void mouseTracking();
     void mouseTracking2();
+    void render();
+    void exposeRegion();
 
     // task specific tests below me
     void task172231_untransformableItems();
@@ -2525,6 +2529,8 @@ void tst_QGraphicsView::acceptMousePressEvent()
 
     scene.addRect(0, 0, 2000, 2000)->setFlag(QGraphicsItem::ItemIsMovable);
 
+    qApp->processEvents(); // ensure scene rect is updated
+
     QApplication::sendEvent(view.viewport(), &event);
     QVERIFY(view.accepted);
 }
@@ -3042,6 +3048,67 @@ void tst_QGraphicsView::scrollAfterResize()
     QCOMPARE(view.viewportTransform(), x3);
 }
 
+void tst_QGraphicsView::moveItemWhileScrolling_data()
+{
+    QTest::addColumn<bool>("adjustForAntialiasing");
+
+    QTest::newRow("no adjust") << false;
+    QTest::newRow("adjust") << true;
+}
+
+void tst_QGraphicsView::moveItemWhileScrolling()
+{
+    QFETCH(bool, adjustForAntialiasing);
+
+    class MoveItemScrollView : public QGraphicsView
+    {
+    public:
+        MoveItemScrollView()
+        {
+            setScene(new QGraphicsScene(0, 0, 1000, 1000));
+            rect = scene()->addRect(0, 0, 10, 10);
+            rect->setPos(50, 50);
+        }
+        QRegion lastPaintedRegion;
+        QGraphicsItem *rect;
+    protected:
+        void paintEvent(QPaintEvent *event)
+        {
+            lastPaintedRegion = event->region();
+            QGraphicsView::paintEvent(event);
+        }
+    };
+
+    MoveItemScrollView view;
+    view.setFrameStyle(0);
+    view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    view.setResizeAnchor(QGraphicsView::NoAnchor);
+    view.setTransformationAnchor(QGraphicsView::NoAnchor);
+    if (!adjustForAntialiasing)
+        view.setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing);
+    view.show();
+    view.resize(200, 200);
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(100);
+
+    view.lastPaintedRegion = QRegion();
+    view.horizontalScrollBar()->setValue(view.horizontalScrollBar()->value() + 10);
+    view.rect->moveBy(0, 10);
+    QTest::qWait(100);
+
+    QRegion expectedRegion;
+    expectedRegion += QRect(0, 0, 200, 200);
+    expectedRegion -= QRect(0, 0, 190, 200);
+    int a = adjustForAntialiasing ? 2 : 1;
+    expectedRegion += QRect(40, 50, 10, 10).adjusted(-a, -a, a, a);
+    expectedRegion += QRect(40, 60, 10, 10).adjusted(-a, -a, a, a);
+
+    QCOMPARE(view.lastPaintedRegion, expectedRegion);
+}
+
 void tst_QGraphicsView::centerOnDirtyItem()
 {
     QGraphicsView view;
@@ -3201,6 +3268,95 @@ void tst_QGraphicsView::mouseTracking2()
     QCOMPARE(spy.count(), 1);
 }
 
+class RenderTester : public QGraphicsRectItem
+{
+public:
+    RenderTester(const QRectF &rect)
+        : QGraphicsRectItem(rect), paints(0)
+    { }
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget)
+    {
+        QGraphicsRectItem::paint(painter, option, widget);
+        ++paints;
+    }
+    
+    int paints;
+};
+
+void tst_QGraphicsView::render()
+{
+    // ### This test can be much more thorough - see QGraphicsScene::render.
+    QGraphicsScene scene;
+    RenderTester *r1 = new RenderTester(QRectF(0, 0, 50, 50));
+    RenderTester *r2 = new RenderTester(QRectF(50, 50, 50, 50));
+    RenderTester *r3 = new RenderTester(QRectF(0, 50, 50, 50));
+    RenderTester *r4 = new RenderTester(QRectF(50, 0, 50, 50));
+    scene.addItem(r1);
+    scene.addItem(r2);
+    scene.addItem(r3);
+    scene.addItem(r4);
+
+    QGraphicsView view(&scene);
+    view.setFrameStyle(0);
+    view.resize(200, 200);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(200);
+
+    QCOMPARE(r1->paints, 1);
+    QCOMPARE(r2->paints, 1);
+    QCOMPARE(r3->paints, 1);
+    QCOMPARE(r4->paints, 1);
+
+    QPixmap pix(200, 200);
+    pix.fill(Qt::transparent);
+    QPainter painter(&pix);
+    view.render(&painter);
+    painter.end();
+
+    QCOMPARE(r1->paints, 2);
+    QCOMPARE(r2->paints, 2);
+    QCOMPARE(r3->paints, 2);
+    QCOMPARE(r4->paints, 2);
+}
+
+void tst_QGraphicsView::exposeRegion()
+{
+    RenderTester *item = new RenderTester(QRectF(0, 0, 20, 20));
+    QGraphicsScene scene;
+    scene.addItem(item);
+
+    CustomView view;
+    view.setScene(&scene);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(125);
+
+    item->paints = 0;
+    view.lastUpdateRegions.clear();
+
+    // Update a small area in the viewport's topLeft() and bottomRight().
+    // (the boundingRect() of this area covers the entire viewport).
+    QWidget *viewport = view.viewport();
+    QRegion expectedExposeRegion = QRect(0, 0, 5, 5);
+    expectedExposeRegion += QRect(viewport->rect().bottomRight() - QPoint(5, 5), QSize(5, 5));
+    viewport->update(expectedExposeRegion);
+    qApp->processEvents();
+
+    // Make sure it triggers correct repaint on the view.
+    QCOMPARE(view.lastUpdateRegions.size(), 1);
+    QCOMPARE(view.lastUpdateRegions.at(0), expectedExposeRegion);
+
+    // Make sure the item didn't get any repaints.
+    QCOMPARE(item->paints, 0);
+}
+
 void tst_QGraphicsView::task253415_reconnectUpdateSceneOnSceneChanged()
 {
     QGraphicsView view;
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 56d42c3..00f3155 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -155,6 +155,7 @@ private slots:
     void windowFlags_data();
     void windowFlags();
     void shortcutsDeletion();
+    void painterStateProtectionOnWindowFrame();
 
     // Task fixes
     void task236127_bspTreeIndexFails();
@@ -2282,6 +2283,41 @@ void tst_QGraphicsWidget::shortcutsDeletion()
     delete widget;
 }
 
+class MessUpPainterWidget : public QGraphicsWidget
+{
+public:
+    MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0)
+    : QGraphicsWidget(parent, wFlags)
+    {}
+
+    void paintWindowFrame(QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        QCOMPARE(painter->opacity(), 1.0);
+        painter->setOpacity(0.0);
+        QGraphicsWidget::paintWindowFrame(painter, option, widget);
+    }
+    void paint(QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        QCOMPARE(painter->opacity(), 1.0);
+        painter->drawRect(0, 0, 100, 100);
+        QGraphicsWidget::paint(painter, option, widget);
+    }
+
+};
+
+void tst_QGraphicsWidget::painterStateProtectionOnWindowFrame()
+{
+    MessUpPainterWidget *widget = new MessUpPainterWidget(0, Qt::Window);
+    QGraphicsScene scene(0, 0, 300, 300);
+    QGraphicsView view(&scene);
+    scene.addItem(widget);
+    view.show();
+#ifdef Q_WS_X11
+    qt_x11_wait_for_window_manager(&view);
+#endif
+    QTest::qWait(500);
+}
+
 class ProxyStyle : public QCommonStyle
 {
 public:
diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp
index 0f763fc..c635381 100644
--- a/tests/auto/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp
@@ -67,6 +67,7 @@ private slots:
     void getInteger();
     void getDouble_data();
     void getDouble();
+    void task255502getDouble();
     void getText_data();
     void getText();
     void getItem_data();
@@ -318,6 +319,20 @@ void tst_QInputDialog::getDouble()
     delete parent;
 }
 
+void tst_QInputDialog::task255502getDouble()
+{
+    parent = new QWidget;
+    testFunc = &tst_QInputDialog::testFuncGetDouble;
+    startTimer(0);
+    bool ok = false;
+    const double value = 0.001;
+    const double result =
+        QInputDialog::getDouble(parent, "", "", value, -1, 1, 4, &ok);
+    QVERIFY(ok);
+    QCOMPARE(result, value);
+    delete parent;
+}
+
 void tst_QInputDialog::getText_data()
 {
     QTest::addColumn<QString>("text");
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
index 615ac01..50e1ff0 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
@@ -1034,7 +1034,7 @@ void tst_QItemDelegate::editorEvent()
     option.rect = rect;
     option.state |= QStyle::State_Enabled;
 
-    const int checkMargin = qApp->style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, 0) + 1; 
+    const int checkMargin = qApp->style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, 0) + 1;
     QPoint pos = inCheck ? qApp->style()->subElementRect(QStyle::SE_ViewItemCheckIndicator, &option, 0).center() + QPoint(checkMargin, 0) : QPoint(200,200);
 
     QEvent *event = new QMouseEvent((QEvent::Type)type,
@@ -1057,7 +1057,7 @@ void tst_QItemDelegate::enterKey_data()
     QTest::addColumn<int>("widget");
     QTest::addColumn<int>("key");
     QTest::addColumn<bool>("expectedFocus");
-    
+
     QTest::newRow("lineedit enter") << 1 << int(Qt::Key_Enter) << false;
     QTest::newRow("textedit enter") << 2 << int(Qt::Key_Enter) << true;
     QTest::newRow("plaintextedit enter") << 3 << int(Qt::Key_Enter) << true;
@@ -1071,17 +1071,17 @@ void tst_QItemDelegate::enterKey()
     QFETCH(int, widget);
     QFETCH(int, key);
     QFETCH(bool, expectedFocus);
-    
+
     QStandardItemModel model;
     model.appendRow(new QStandardItem());
-    
+
     QListView view;
     view.setModel(&model);
     view.show();
     QApplication::setActiveWindow(&view);
     view.setFocus();
     QTest::qWait(30);
-    
+
     struct TestDelegate : public QItemDelegate
     {
         int widgetType;
@@ -1089,7 +1089,7 @@ void tst_QItemDelegate::enterKey()
         {
             QWidget *editor = 0;
             switch(widgetType) {
-                case 1: 
+                case 1:
                     editor = new QLineEdit(parent);
                     break;
                 case 2:
@@ -1103,25 +1103,25 @@ void tst_QItemDelegate::enterKey()
             return editor;
         }
     } delegate;
-    
+
     delegate.widgetType = widget;
-    
+
     view.setItemDelegate(&delegate);
     QModelIndex index = model.index(0, 0);
     view.setCurrentIndex(index); // the editor will only selectAll on the current index
     view.edit(index);
     QTest::qWait(30);
-    
+
     QList<QWidget*> lineEditors = qFindChildren<QWidget *>(view.viewport(), QString::fromLatin1("TheEditor"));
     QCOMPARE(lineEditors.count(), 1);
-    
-    QWidget *editor = lineEditors.at(0);
+
+    QPointer<QWidget> editor = lineEditors.at(0);
     QCOMPARE(editor->hasFocus(), true);
-    
+
     QTest::keyClick(editor, Qt::Key(key));
     QApplication::processEvents();
-    
-    QCOMPARE(editor->hasFocus(), expectedFocus);
+
+    QCOMPARE(editor && editor->hasFocus(), expectedFocus);
 }
 
 
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index 8d15aa4..8468cf3 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -883,31 +883,46 @@ void tst_QListWidget::itemStreaming()
 void tst_QListWidget::sortItems_data()
 {
     QTest::addColumn<int>("order");
-    QTest::addColumn<QStringList>("initialList");
-    QTest::addColumn<QStringList>("expectedList");
+    QTest::addColumn<QVariantList>("initialList");
+    QTest::addColumn<QVariantList>("expectedList");
     QTest::addColumn<IntList>("expectedRows");
 
-    QTest::newRow("ascending order")
+    QTest::newRow("ascending strings")
         << static_cast<int>(Qt::AscendingOrder)
-        << (QStringList() << "c" << "d" << "a" << "b")
-        << (QStringList() << "a" << "b" << "c" << "d")
+        << (QVariantList() << QString("c") << QString("d") << QString("a") << QString("b"))
+        << (QVariantList() << QString("a") << QString("b") << QString("c") << QString("d"))
         << (IntList() << 2 << 3 << 0 << 1);
 
-    QTest::newRow("descending order")
+    QTest::newRow("descending strings")
         << static_cast<int>(Qt::DescendingOrder)
-        << (QStringList() << "c" << "d" << "a" << "b")
-        << (QStringList() << "d" << "c" << "b" << "a")
+        << (QVariantList() << QString("c") << QString("d") << QString("a") << QString("b"))
+        << (QVariantList() << QString("d") << QString("c") << QString("b") << QString("a"))
         << (IntList() << 1 << 0 << 3 << 2);
+
+    QTest::newRow("ascending numbers")
+        << static_cast<int>(Qt::AscendingOrder)
+        << (QVariantList() << 1 << 11 << 2 << 22)
+        << (QVariantList() << 1 << 2 << 11 << 22)
+        << (IntList() << 0 << 2 << 1 << 3);
+
+    QTest::newRow("descending numbers")
+        << static_cast<int>(Qt::DescendingOrder)
+        << (QVariantList() << 1 << 11 << 2 << 22)
+        << (QVariantList() << 22 << 11 << 2 << 1)
+        << (IntList() << 3 << 1 << 2 << 0);
 }
 
 void tst_QListWidget::sortItems()
 {
     QFETCH(int, order);
-    QFETCH(QStringList, initialList);
-    QFETCH(QStringList, expectedList);
+    QFETCH(QVariantList, initialList);
+    QFETCH(QVariantList, expectedList);
     QFETCH(IntList, expectedRows);
 
-    testWidget->addItems(initialList);
+    foreach (const QVariant &data, initialList) {
+        QListWidgetItem *item = new QListWidgetItem(testWidget);
+        item->setData(Qt::DisplayRole, data);
+    }
 
     QAbstractItemModel *model = testWidget->model();
     QList<QPersistentModelIndex> persistent;
@@ -918,7 +933,7 @@ void tst_QListWidget::sortItems()
 
     QCOMPARE(testWidget->count(), expectedList.count());
     for (int i = 0; i < testWidget->count(); ++i)
-        QCOMPARE(testWidget->item(i)->text(), expectedList.at(i));
+        QCOMPARE(testWidget->item(i)->text(), expectedList.at(i).toString());
 
     for (int k = 0; k < testWidget->count(); ++k)
         QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 1178c81..1ba81bd 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -39,13 +39,14 @@
 **
 ****************************************************************************/
 
+#include <QtTest/QtTest>
+
 #if !defined(QMAKE_CROSS_COMPILED)
 
 #include "testcompiler.h"
 
 #include <QObject>
 #include <QDir>
-#include <QtTest/QtTest>
 
 class tst_qmake : public QObject
 {
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 43b4ea9..a93d0b6 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -243,6 +243,8 @@ private Q_SLOTS:
     void proxyChange();
     void authorizationError_data();
     void authorizationError();
+
+    void httpConnectionCount();
 };
 
 QT_BEGIN_NAMESPACE
@@ -3665,5 +3667,34 @@ void tst_QNetworkReply::authorizationError()
     QCOMPARE(QString(reply->readAll()), httpBody);
 }
 
+void tst_QNetworkReply::httpConnectionCount()
+{
+    QTcpServer server;
+    QVERIFY(server.listen());
+    QCoreApplication::instance()->processEvents();
+
+    for (int i = 0; i < 10; i++) {
+        QNetworkRequest request (QUrl("http://127.0.0.1:" + QString::number(server.serverPort()) + "/" +  QString::number(i)));
+        QNetworkReply* reply = manager.get(request);
+        reply->setParent(this);
+    }
+
+    int pendingConnectionCount = 0;
+    QTime time;
+    time.start();
+
+    while(pendingConnectionCount != 6) {
+        QCoreApplication::instance()->processEvents();
+        while (server.nextPendingConnection())
+            pendingConnectionCount++;
+
+        // at max. wait 10 sec
+        if (time.elapsed() > 10000)
+            break;
+    }
+
+    QCOMPARE(pendingConnectionCount, 6);
+}
+
 QTEST_MAIN(tst_QNetworkReply)
 #include "tst_qnetworkreply.moc"
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 8a6b63b..06e50d7 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -48,6 +48,8 @@
 #include <qdesktopwidget.h>
 #include <qpaintengine.h>
 
+#include <private/qpixmapdata_p.h>
+
 #include <QSet>
 
 #ifdef Q_WS_WIN
@@ -140,6 +142,38 @@ private slots:
     void fromData();
 };
 
+static bool lenientCompare(const QPixmap &actual, const QPixmap &expected)
+{
+    QImage expectedImage = expected.toImage().convertToFormat(QImage::Format_RGB32);
+    QImage actualImage = actual.toImage().convertToFormat(QImage::Format_RGB32);
+
+    if (expectedImage.size() != actualImage.size())
+        return false;
+
+    int size = actual.width() * actual.height();
+
+    QRgb *a = (QRgb *)actualImage.bits();
+    QRgb *e = (QRgb *)expectedImage.bits();
+    for (int i = 0; i < size; ++i) {
+        QColor ca(a[i]);
+        QColor ce(e[i]);
+
+        bool result = true;
+
+        if (qAbs(ca.red() - ce.red()) > 2)
+            result = false;
+        if (qAbs(ca.green() - ce.green()) > 2)
+            result = false;
+        if (qAbs(ca.blue() - ce.blue()) > 2)
+            result = false;
+
+        if (!result)
+            return false;
+    }
+
+    return true;
+}
+
 Q_DECLARE_METATYPE(QImage)
 Q_DECLARE_METATYPE(QPixmap)
 Q_DECLARE_METATYPE(QMatrix)
@@ -202,7 +236,7 @@ void tst_QPixmap::setAlphaChannel()
     pixmap.setAlphaChannel(alphaChannel);
 
 #ifdef Q_WS_X11
-    if (!pixmap.x11PictureHandle())
+    if (pixmap.pixmapData()->classId() == QPixmapData::X11Class && !pixmap.x11PictureHandle())
         QSKIP("Requires XRender support", SkipAll);
 #endif
 
@@ -261,7 +295,7 @@ void tst_QPixmap::fromImage()
 
     const QPixmap pixmap = QPixmap::fromImage(image);
 #ifdef Q_WS_X11
-    if (!pixmap.x11PictureHandle())
+    if (pixmap.pixmapData()->classId() == QPixmapData::X11Class && !pixmap.x11PictureHandle())
         QSKIP("Requires XRender support", SkipAll);
 #endif
     const QImage result = pixmap.toImage();
@@ -376,7 +410,7 @@ void tst_QPixmap::scroll()
     QFETCH(QRegion, exposed);
     QFETCH(bool, newPix);
 
-    QPixmap pixmap(input);
+    QPixmap pixmap = QPixmap::fromImage(input);
     QRegion exp;
     qint64 oldKey = pixmap.cacheKey();
     pixmap.scroll(dx, dy, rect, &exp);
@@ -392,9 +426,9 @@ void tst_QPixmap::scroll()
 #else
     QString fileName = QString(":/images/%1.png").arg(QTest::currentDataTag());
 #endif
-    QImage output(fileName);
+    QPixmap output(fileName);
     QVERIFY(input.isNull() == output.isNull());
-    QCOMPARE(pixmap.toImage(), output);
+    QVERIFY(lenientCompare(pixmap, output));
     QCOMPARE(exp, exposed);
 }
 
@@ -463,7 +497,7 @@ void tst_QPixmap::fill()
         pm = QPixmap(400, 400);
 
 #if defined(Q_WS_X11)
-    if (!bitmap && !pm.x11PictureHandle())
+    if (!bitmap && pm.pixmapData()->classId() == QPixmapData::X11Class && !pm.x11PictureHandle())
         QSKIP("Requires XRender support", SkipSingle);
 #endif
 
@@ -475,7 +509,7 @@ void tst_QPixmap::fill()
     QImage image = pm.toImage();
     if (bitmap && syscolor) {
         int pixelindex = (pixel == Qt::color0) ? 0 : 1;
-        QVERIFY(image.pixelIndex(0,0) == pixelindex);
+        QCOMPARE(image.pixelIndex(0,0), pixelindex);
     }
     QImage::Format format = compareColor.alpha() != 255
                             ? QImage::Format_ARGB32
@@ -493,7 +527,7 @@ void tst_QPixmap::fill_transparent()
 {
     QPixmap pixmap(10, 10);
 #ifdef Q_WS_X11
-    if (!pixmap.x11PictureHandle())
+    if (pixmap.pixmapData()->classId() == QPixmapData::X11Class && !pixmap.x11PictureHandle())
         QSKIP("Requires XRender support", SkipAll);
 #endif
     pixmap.fill(Qt::transparent);
@@ -613,7 +647,7 @@ void tst_QPixmap::testMetrics()
 
     QCOMPARE(pixmap.width(), 100);
     QCOMPARE(pixmap.height(), 100);
-    QCOMPARE(pixmap.depth(), QPixmap::defaultDepth());
+    QVERIFY(pixmap.depth() >= QPixmap::defaultDepth());
 
     QBitmap bitmap(100, 100);
 
@@ -675,7 +709,11 @@ void tst_QPixmap::drawBitmap()
     painter2.setPen(Qt::red);
     painter2.drawPixmap(0,0,10,10, bitmap);
     painter2.end();
-    QCOMPARE(pixmap.toImage().pixel(5,5), QColor(Qt::red).rgb());
+
+    QPixmap expected(10, 10);
+    expected.fill(Qt::red);
+
+    QVERIFY(lenientCompare(pixmap, expected));
 }
 
 void tst_QPixmap::grabWidget()
@@ -688,8 +726,7 @@ void tst_QPixmap::grabWidget()
     expected.fill(Qt::green);
 
     QPixmap actual = QPixmap::grabWidget(&widget, QRect(64, 64, 64, 64));
-
-    QCOMPARE(actual, expected);
+    QVERIFY(lenientCompare(actual, expected));
 }
 
 void tst_QPixmap::grabWindow()
@@ -720,7 +757,7 @@ void tst_QPixmap::grabWindow()
 
     QPixmap grabWindowPixmap = QPixmap::grabWindow(child.winId());
     QPixmap grabWidgetPixmap = QPixmap::grabWidget(&child);
-    QCOMPARE(grabWindowPixmap, grabWidgetPixmap);
+    lenientCompare(grabWindowPixmap, grabWidgetPixmap);
 }
 
 void tst_QPixmap::isNull()
@@ -960,10 +997,10 @@ void tst_QPixmap::copy()
     }
 
     QPixmap dest = src.copy(10, 10, 10, 10);
-    QImage result = dest.toImage().convertToFormat(QImage::Format_RGB32);
-    QImage expected(10, 10, QImage::Format_RGB32);
-    expected.fill(0xff0000ff);
-    QCOMPARE(result, expected);
+
+    QPixmap expected(10, 10);
+    expected.fill(Qt::blue);
+    QVERIFY(lenientCompare(dest, expected));
 }
 
 #ifdef QT3_SUPPORT
@@ -1031,27 +1068,33 @@ void tst_QPixmap::transformed()
     }
 
     QPixmap p2(10, 20);
-    p2.fill(Qt::red);
     {
         QPainter p(&p2);
-        p.drawRect(0, 0, p2.width() - 1, p2.height() - 1);
+        p.rotate(90);
+        p.drawPixmap(0, -p1.height(), p1);
+    }
+
+    QPixmap p3(20, 10);
+    {
+        QPainter p(&p3);
+        p.rotate(180);
+        p.drawPixmap(-p1.width(), -p1.height(), p1);
+    }
+
+    QPixmap p4(10, 20);
+    {
+        QPainter p(&p4);
+        p.rotate(270);
+        p.drawPixmap(-p1.width(), 0, p1);
     }
 
     QPixmap p1_90 = p1.transformed(QTransform().rotate(90));
     QPixmap p1_180 = p1.transformed(QTransform().rotate(180));
     QPixmap p1_270 = p1.transformed(QTransform().rotate(270));
 
-    QCOMPARE(p1_90.size(), p2.size());
-    QCOMPARE(p1_90.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied),
-             p2.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied));
-
-    QCOMPARE(p1_180.size(), p1.size());
-    QCOMPARE(p1_180.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied),
-             p1.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied));
-
-    QCOMPARE(p1_270.size(), p2.size());
-    QCOMPARE(p1_270.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied),
-             p2.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied));
+    QVERIFY(lenientCompare(p1_90, p2));
+    QVERIFY(lenientCompare(p1_180, p3));
+    QVERIFY(lenientCompare(p1_270, p4));
 }
 
 void tst_QPixmap::transformed2()
@@ -1079,9 +1122,7 @@ void tst_QPixmap::transformed2()
     p.drawRect(3, 6, 3, 3);
     p.end();
 
-    QCOMPARE(actual.size(), expected.size());
-    QCOMPARE(actual.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied),
-             expected.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied));
+    QVERIFY(lenientCompare(actual, expected));
 }
 
 void tst_QPixmap::fromImage_crash()
diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp
index 5eabbee..1dd975a 100644
--- a/tests/auto/qscriptable/tst_qscriptable.cpp
+++ b/tests/auto/qscriptable/tst_qscriptable.cpp
@@ -49,7 +49,7 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
-class MyScriptable : public QObject, protected QScriptable
+class MyScriptable : public QObject, public QScriptable
 {
     Q_OBJECT
     Q_PROPERTY(int baz READ baz WRITE setBaz)
@@ -87,6 +87,7 @@ public slots:
     QObject *zab();
     QObject *setZab(QObject *);
     QScriptValue getArguments();
+    int getArgumentCount();
 
 signals:
     void sig(int);
@@ -128,6 +129,11 @@ QScriptValue MyScriptable::getArguments()
     return context()->argumentsObject();
 }
 
+int MyScriptable::getArgumentCount()
+{
+    return context()->argumentCount();
+}
+
 void MyScriptable::foo()
 {
     m_lastEngine = engine();
@@ -224,6 +230,8 @@ void tst_QScriptable::cleanupTestCase()
 
 void tst_QScriptable::engine()
 {
+    QCOMPARE(m_scriptable.engine(), (QScriptEngine*)0);
+    QCOMPARE(m_scriptable.context(), (QScriptContext*)0);
     QCOMPARE(m_scriptable.lastEngine(), (QScriptEngine *)0);
 
     // reading property
@@ -360,6 +368,14 @@ void tst_QScriptable::arguments()
     QVERIFY(args.property("1").strictlyEquals(QScriptValue(&m_engine, 20)));
     QVERIFY(args.property("2").strictlyEquals(QScriptValue(&m_engine, 30)));
     QVERIFY(args.property("3").strictlyEquals(QScriptValue(&m_engine, "hi")));
+
+    QScriptValue argc = m_engine.evaluate("scriptable.getArgumentCount(1, 2, 3)");
+    QVERIFY(argc.isNumber());
+    QCOMPARE(argc.toInt32(), 3);
+
+    QCOMPARE(m_scriptable.argumentCount(), -1);
+    QVERIFY(!m_scriptable.argument(-1).isValid());
+    QVERIFY(!m_scriptable.argument(0).isValid());
 }
 
 void tst_QScriptable::throwError()
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index bfcd6ee..e2eb8cf0 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -72,6 +72,7 @@ private slots:
     void scopeChain();
     void pushAndPopScope();
     void getSetActivationObject();
+    void toString();
 };
 
 tst_QScriptContext::tst_QScriptContext()
@@ -438,6 +439,7 @@ void tst_QScriptContext::pushAndPopContext()
     QCOMPARE(ctx->isCalledAsConstructor(), false);
     QCOMPARE(ctx->argumentCount(), 0);
     QCOMPARE(ctx->argument(0).isUndefined(), true);
+    QVERIFY(!ctx->argument(-1).isValid());
     QCOMPARE(ctx->argumentsObject().isObject(), true);
     QCOMPARE(ctx->activationObject().isObject(), true);
     QCOMPARE(ctx->callee().isValid(), false);
@@ -687,5 +689,21 @@ void tst_QScriptContext::getSetActivationObject()
     }
 }
 
+static QScriptValue parentContextToString(QScriptContext *ctx, QScriptEngine *)
+{
+    return ctx->parentContext()->toString();
+}
+
+void tst_QScriptContext::toString()
+{
+    QScriptEngine eng;
+    eng.globalObject().setProperty("parentContextToString", eng.newFunction(parentContextToString));
+    QScriptValue ret = eng.evaluate("function foo(first, second, third) {\n"
+                                    "    return parentContextToString();\n"
+                                    "}; foo(1, 2, 3)", "script.qs");
+    QVERIFY(ret.isString());
+    QCOMPARE(ret.toString(), QString::fromLatin1("foo (first=1, second=2, third=3) at script.qs:2"));
+}
+
 QTEST_MAIN(tst_QScriptContext)
 #include "tst_qscriptcontext.moc"
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index df1e14f..82c66f8 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -95,6 +95,7 @@ private slots:
     void builtinFunctionNames();
     void nullContext();
     void streaming();
+    void assignmentAndComparison();
 };
 
 tst_QScriptContextInfo::tst_QScriptContextInfo()
@@ -553,5 +554,24 @@ void tst_QScriptContextInfo::streaming()
     }
 }
 
+void tst_QScriptContextInfo::assignmentAndComparison()
+{
+    QScriptEngine eng;
+    eng.globalObject().setProperty("getContextInfoList", eng.newFunction(getContextInfoList));
+    QString fileName = "ciao.qs";
+    int lineNumber = 456;
+    QScriptValue ret = eng.evaluate("function bar(a, b, c) {\n return getContextInfoList();\n}\nbar()",
+                                    fileName, lineNumber);
+    QList<QScriptContextInfo> lst = qscriptvalue_cast<QList<QScriptContextInfo> >(ret);
+    QCOMPARE(lst.size(), 3);
+    QScriptContextInfo ci = lst.at(0);
+    QScriptContextInfo same = ci;
+    QVERIFY(ci == same);
+    QVERIFY(!(ci != same));
+    QScriptContextInfo other = lst.at(1);
+    QVERIFY(!(ci == other));
+    QVERIFY(ci != other);
+}
+
 QTEST_MAIN(tst_QScriptContextInfo)
 #include "tst_qscriptcontextinfo.moc"
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index fe60cd0..230f889 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -64,6 +64,7 @@ public:
     virtual ~tst_QScriptEngine();
 
 private slots:
+    void constructWithParent();
     void currentContext();
     void pushPopContext();
     void getSetDefaultPrototype();
@@ -119,6 +120,7 @@ private slots:
     void getSetAgent();
     void reentrancy();
     void incDecNonObjectProperty();
+    void installTranslatorFunctions();
 };
 
 tst_QScriptEngine::tst_QScriptEngine()
@@ -129,6 +131,17 @@ tst_QScriptEngine::~tst_QScriptEngine()
 {
 }
 
+void tst_QScriptEngine::constructWithParent()
+{
+    QPointer<QScriptEngine> ptr;
+    {
+        QObject obj;
+        QScriptEngine *engine = new QScriptEngine(&obj);
+        ptr = engine;
+    }
+    QVERIFY(ptr == 0);
+}
+
 void tst_QScriptEngine::currentContext()
 {
     QScriptEngine eng;
@@ -945,6 +958,22 @@ void tst_QScriptEngine::checkSyntax()
     QCOMPARE(result.errorLineNumber(), errorLineNumber);
     QCOMPARE(result.errorColumnNumber(), errorColumnNumber);
     QCOMPARE(result.errorMessage(), errorMessage);
+
+    // assignment
+    {
+        QScriptSyntaxCheckResult copy = result;
+        QCOMPARE(copy.state(), result.state());
+        QCOMPARE(copy.errorLineNumber(), result.errorLineNumber());
+        QCOMPARE(copy.errorColumnNumber(), result.errorColumnNumber());
+        QCOMPARE(copy.errorMessage(), result.errorMessage());
+    }
+    {
+        QScriptSyntaxCheckResult copy(result);
+        QCOMPARE(copy.state(), result.state());
+        QCOMPARE(copy.errorLineNumber(), result.errorLineNumber());
+        QCOMPARE(copy.errorColumnNumber(), result.errorColumnNumber());
+        QCOMPARE(copy.errorMessage(), result.errorMessage());
+    }
 }
 
 void tst_QScriptEngine::canEvaluate_data()
@@ -1467,6 +1496,61 @@ void tst_QScriptEngine::valueConversion()
         Foo foo = qScriptValueToValue<Foo>(str);
         QCOMPARE(foo.x, 123);
     }
+
+    // more built-in types
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, uint(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, qulonglong(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, float(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, short(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, ushort(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, char(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QScriptValue val = qScriptValueFromValue(&eng, uchar(123));
+        QVERIFY(val.isNumber());
+        QCOMPARE(val.toInt32(), 123);
+    }
+    {
+        QDateTime in = QDateTime::currentDateTime();
+        QScriptValue val = qScriptValueFromValue(&eng, in);
+        QVERIFY(val.isDate());
+        QCOMPARE(val.toDateTime(), in);
+    }
+    {
+        QDate in = QDate::currentDate();
+        QScriptValue val = qScriptValueFromValue(&eng, in);
+        QVERIFY(val.isDate());
+        QCOMPARE(val.toDateTime().date(), in);
+    }
+    {
+        QRegExp in = QRegExp("foo");
+        QScriptValue val = qScriptValueFromValue(&eng, in);
+        QVERIFY(val.isRegExp());
+        QCOMPARE(val.toRegExp(), in);
+    }
 }
 
 static QScriptValue __import__(QScriptContext *ctx, QScriptEngine *eng)
@@ -3415,5 +3499,49 @@ void tst_QScriptEngine:: incDecNonObjectProperty()
     }
 }
 
+void tst_QScriptEngine::installTranslatorFunctions()
+{
+    QScriptEngine eng;
+    QScriptValue global = eng.globalObject();
+    QVERIFY(!global.property("qsTranslate").isValid());
+    QVERIFY(!global.property("QT_TRANSLATE_NOOP").isValid());
+    QVERIFY(!global.property("qsTr").isValid());
+    QVERIFY(!global.property("QT_TR_NOOP").isValid());
+    QVERIFY(!global.property("String").property("prototype").property("arg").isValid());
+
+    eng.installTranslatorFunctions();
+    QVERIFY(global.property("qsTranslate").isFunction());
+    QVERIFY(global.property("QT_TRANSLATE_NOOP").isFunction());
+    QVERIFY(global.property("qsTr").isFunction());
+    QVERIFY(global.property("QT_TR_NOOP").isFunction());
+    QVERIFY(global.property("String").property("prototype").property("arg").isFunction());
+
+    {
+        QScriptValue ret = eng.evaluate("qsTr('foo')");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
+    }
+    {
+        QScriptValue ret = eng.evaluate("qsTranslate('foo', 'bar')");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("bar"));
+    }
+    {
+        QScriptValue ret = eng.evaluate("QT_TR_NOOP('foo')");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("foo"));
+    }
+    {
+        QScriptValue ret = eng.evaluate("QT_TRANSLATE_NOOP('foo', 'bar')");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("bar"));
+    }
+    {
+        QScriptValue ret = eng.evaluate("'foo%0'.arg('bar')");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("foobar"));
+    }
+}
+
 QTEST_MAIN(tst_QScriptEngine)
 #include "tst_qscriptengine.moc"
diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
index aa5da04..41e14ce 100644
--- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
+++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
@@ -118,8 +118,22 @@ void tst_QScriptEngineDebugger::attachAndDetach()
     {
         QScriptEngineDebugger debugger;
         QScriptEngine engine;
+        QScriptValue oldPrint = engine.globalObject().property("print");
+        QVERIFY(oldPrint.isFunction());
+        QVERIFY(!engine.globalObject().property("__FILE__").isValid());
+        QVERIFY(!engine.globalObject().property("__LINE__").isValid());
+
         debugger.attachTo(&engine);
+        QVERIFY(engine.globalObject().property("__FILE__").isUndefined());
+        QVERIFY(engine.globalObject().property("__LINE__").isNumber());
+        QVERIFY(!engine.globalObject().property("print").strictlyEquals(oldPrint));
+
         debugger.detach();
+        QEXPECT_FAIL("", "Task 256184", Continue);
+        QVERIFY(!engine.globalObject().property("print").isValid());
+        QEXPECT_FAIL("", "Task 256184", Continue);
+        QVERIFY(!engine.globalObject().property("__FILE__").isValid());
+//        QVERIFY(!engine.globalObject().property("__LINE__").isValid());
     }
     {
         QScriptEngineDebugger debugger;
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
index 2c47c49..24c283e 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
@@ -1906,6 +1906,22 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect()
         QVERIFY(qScriptDisconnect(m_myObject, SIGNAL(mySignal()), QScriptValue(), fun));
         QCOMPARE(m_myObject->disconnectedSignal().constData(), SIGNAL(mySignal()));
     }
+
+    // bad args
+    QVERIFY(!qScriptConnect(0, SIGNAL(foo()), QScriptValue(), fun));
+    QVERIFY(!qScriptConnect(&edit, 0, QScriptValue(), fun));
+    QVERIFY(!qScriptConnect(&edit, SIGNAL(foo()), QScriptValue(), fun));
+    QVERIFY(!qScriptConnect(&edit, SIGNAL(textChanged(QString)), QScriptValue(), QScriptValue()));
+    QVERIFY(!qScriptDisconnect(0, SIGNAL(foo()), QScriptValue(), fun));
+    QVERIFY(!qScriptDisconnect(&edit, 0, QScriptValue(), fun));
+    QVERIFY(!qScriptDisconnect(&edit, SIGNAL(foo()), QScriptValue(), fun));
+    QVERIFY(!qScriptDisconnect(&edit, SIGNAL(textChanged(QString)), QScriptValue(), QScriptValue()));
+    {
+        QScriptEngine eng2;
+        QScriptValue receiverInDifferentEngine = eng2.newObject();
+        QVERIFY(!qScriptConnect(&edit, SIGNAL(textChanged(QString)), receiverInDifferentEngine, fun));
+        QVERIFY(!qScriptDisconnect(&edit, SIGNAL(textChanged(QString)), receiverInDifferentEngine, fun));
+    }
 }
 
 void tst_QScriptExtQObject::classEnums()
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index ad1080a..7901b65 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1482,21 +1482,43 @@ void tst_QScriptValue::toObject()
     {
         QScriptValue undefined = QScriptValue(QScriptValue::UndefinedValue);
         QVERIFY(!undefined.toObject().isValid());
+        QVERIFY(!eng.toObject(undefined).isValid());
 
         QScriptValue null = QScriptValue(QScriptValue::NullValue);
         QVERIFY(!null.toObject().isValid());
+        QVERIFY(!eng.toObject(null).isValid());
 
         QScriptValue falskt = QScriptValue(false);
         QVERIFY(!falskt.toObject().isValid());
+        {
+            QScriptValue tmp = eng.toObject(falskt);
+            QVERIFY(tmp.isObject());
+            QVERIFY(tmp.toBool());
+        }
 
         QScriptValue sant = QScriptValue(true);
         QVERIFY(!sant.toObject().isValid());
+        {
+            QScriptValue tmp = eng.toObject(sant);
+            QVERIFY(tmp.isObject());
+            QVERIFY(tmp.toBool());
+        }
 
         QScriptValue number = QScriptValue(123.0);
         QVERIFY(!number.toObject().isValid());
+        {
+            QScriptValue tmp = eng.toObject(number);
+            QVERIFY(tmp.isObject());
+            QCOMPARE(tmp.toInt32(), number.toInt32());
+        }
 
-        QScriptValue str = QScriptValue(QString("ciao"));
+        QScriptValue str = QScriptValue(QString::fromLatin1("ciao"));
         QVERIFY(!str.toObject().isValid());
+        {
+            QScriptValue tmp = eng.toObject(str);
+            QVERIFY(tmp.isObject());
+            QCOMPARE(tmp.toString(), QString::fromLatin1("ciao"));
+        }
     }
 }
 
@@ -2360,6 +2382,16 @@ void tst_QScriptValue::call()
             QCOMPARE(qIsNaN(ret.toNumber()), true);
         }
     }
+    {
+        QScriptValue fun = eng.evaluate("Object");
+        QVERIFY(fun.isFunction());
+        QScriptEngine eng2;
+        QScriptValue objectInDifferentEngine = eng2.newObject();
+        QScriptValueList args;
+        args << objectInDifferentEngine;
+        QTest::ignoreMessage(QtWarningMsg, "QScriptValue::call() failed: cannot call function with argument created in a different engine");
+        fun.call(QScriptValue(), args);
+    }
 
     // test that invalid return value is handled gracefully
     {
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index d7c231f..274b177 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -134,6 +134,7 @@ private slots:
     void task250023_fetchMore();
     void task251296_hiddenChildren();
     void task252507_mapFromToSource();
+    void task255652_removeRowsRecursive();
 
 protected:
     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
@@ -390,7 +391,7 @@ void tst_QSortFilterProxyModel::sort()
         QModelIndex index = m_proxy->index(row, 0, QModelIndex());
         QCOMPARE(m_proxy->data(index, Qt::DisplayRole).toString(), initial.at(row));
     }
-    
+
 }
 
 void tst_QSortFilterProxyModel::sortHierarchy_data()
@@ -411,7 +412,7 @@ void tst_QSortFilterProxyModel::sortHierarchy_data()
         << static_cast<int>(Qt::AscendingOrder)
         << (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">")
         << (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">");
-    
+
 #if 1
     QTest::newRow("hierarchical ascending")
         << static_cast<int>(Qt::AscendingOrder)
@@ -571,7 +572,7 @@ void tst_QSortFilterProxyModel::insertRows()
         QModelIndex index = m_proxy->index(row, 0, QModelIndex());
         QCOMPARE(m_proxy->data(index, Qt::DisplayRole).toString(), initial.at(row));
     }
-    
+
     // insert the row
     m_proxy->insertRows(position, insert.count(), QModelIndex());
     QCOMPARE(m_model->rowCount(QModelIndex()), expected.count());
@@ -615,7 +616,7 @@ void tst_QSortFilterProxyModel::prependRow()
     QStandardItem sub2("sub2");
     sub2.appendRow(new QStandardItem("sub3"));
     item.insertRow(0, &sub2);
-    
+
     QModelIndex index_sub2 = proxy.mapFromSource(model.indexFromItem(&sub2));
 
     QCOMPARE(sub2.rowCount(), proxy.rowCount(index_sub2));
@@ -626,7 +627,7 @@ void tst_QSortFilterProxyModel::prependRow()
 /*
 void tst_QSortFilterProxyModel::insertColumns_data()
 {
-    
+
 }
 
 void tst_QSortFilterProxyModel::insertColumns()
@@ -923,7 +924,7 @@ void tst_QSortFilterProxyModel::removeRows()
     // prepare model
     foreach (QString s, initial)
         model.appendRow(new QStandardItem(s));
-    
+
     // remove the rows
     QCOMPARE(proxy.removeRows(position, count, QModelIndex()), success);
     QCOMPARE(model.rowCount(QModelIndex()), expectedSource.count());
@@ -1164,10 +1165,10 @@ void tst_QSortFilterProxyModel::removeColumns()
     proxy.setSourceModel(&model);
     if (!filter.isEmpty())
         proxy.setFilterRegExp(QRegExp(filter));
-    
+
     // prepare model
     model.setHorizontalHeaderLabels(initial);
-    
+
     // remove the columns
     QCOMPARE(proxy.removeColumns(position, count, QModelIndex()), success);
     QCOMPARE(model.columnCount(QModelIndex()), expectedSource.count());
@@ -1266,7 +1267,7 @@ void tst_QSortFilterProxyModel::filter_data()
                            << "golf"
                            << "quebec"
                            << "foxtrot"
-                           << "india" 
+                           << "india"
                            << "romeo"
                            << "november"
                            << "oskar"
@@ -1274,9 +1275,9 @@ void tst_QSortFilterProxyModel::filter_data()
                            << "kilo"
                            << "whiskey"
                            << "mike"
-                           << "papa" 
+                           << "papa"
                            << "sierra"
-                           << "xray" 
+                           << "xray"
                            << "viktor")
                        << (QStringList()
                            << "delta"
@@ -1334,7 +1335,7 @@ void tst_QSortFilterProxyModel::filterHierarchy_data()
             << "foo" << "boo" << "baz" << "moo" << "laa" << "haa")
         << (QStringList()
             << "foo" << "boo" << "moo");
-    
+
     QTest::newRow("simple hierarchy") << "b.*z"
         << (QStringList() << "baz" << "<" << "boz" << "<" << "moo" << ">" << ">")
         << (QStringList() << "baz" << "<" << "boz" << ">");
@@ -1671,7 +1672,7 @@ void tst_QSortFilterProxyModel::removeSourceRows()
     QSignalSpy insertSpy(&proxy, SIGNAL(rowsInserted(QModelIndex, int, int)));
     QSignalSpy aboutToRemoveSpy(&proxy, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)));
     QSignalSpy aboutToInsertSpy(&proxy, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)));
-    
+
     model.removeRows(start, count, QModelIndex());
 
     QCOMPARE(aboutToRemoveSpy.count(), expectedRemovedProxyIntervals.count());
@@ -1827,7 +1828,7 @@ void tst_QSortFilterProxyModel::changeFilter()
     QFETCH(IntPairList, finalRemoveIntervals);
     QFETCH(IntPairList, insertIntervals);
     QFETCH(QStringList, finalProxyItems);
-    
+
     QStandardItemModel model;
     QSortFilterProxyModel proxy;
 
@@ -1880,7 +1881,7 @@ void tst_QSortFilterProxyModel::changeFilter()
 
 #ifdef Q_OS_IRIX
     QEXPECT_FAIL("filter (2)", "Not reliable on IRIX", Abort);
-#endif    
+#endif
     QCOMPARE(finalInsertSpy.count(), insertIntervals.count());
     for (int i = 0; i < finalInsertSpy.count(); ++i) {
         QList<QVariant> args = finalInsertSpy.at(i);
@@ -2068,7 +2069,7 @@ void tst_QSortFilterProxyModel::sortFilterRole()
         model.setData(index, sourceItems.at(i).first, Qt::DisplayRole);
         model.setData(index, sourceItems.at(i).second, Qt::UserRole);
     }
-        
+
     proxy.setFilterRegExp("2");
     QCOMPARE(proxy.rowCount(), 0); // Qt::DisplayRole is default role
 
@@ -2358,7 +2359,7 @@ void tst_QSortFilterProxyModel::sourceInsertRows()
       model.insertColumns(0, 1, parent);
       model.insertRows(0, 1, parent);
     }
-   
+
     model.insertRows(0, 1, QModelIndex());
     model.insertRows(0, 1, QModelIndex());
 
@@ -2462,7 +2463,7 @@ void tst_QSortFilterProxyModel::task236755_hiddenColumns()
     QVERIFY(view.isColumnHidden(0));
 }
 
-void tst_QSortFilterProxyModel::task247867_insertRowsSort() 
+void tst_QSortFilterProxyModel::task247867_insertRowsSort()
 {
     QStandardItemModel model(2,2);
     QSortFilterProxyModel proxyModel;
@@ -2567,7 +2568,7 @@ void tst_QSortFilterProxyModel::task248868_dynamicSorting()
     QStringList initial2 = initial;
     initial2.replaceInStrings("bateau", "girafe");
     model1.setStringList(initial2); //this will cause a reset
-    
+
     QStringList expected2 = initial2;
     expected2.sort();
 
@@ -2648,7 +2649,7 @@ class QtTestModel: public QAbstractItemModel
         {
             if (!idx.isValid())
                 return QVariant();
-            
+
             if (role == Qt::DisplayRole) {
                 if (idx.row() < 0 || idx.column() < 0 || idx.column() >= cols || idx.row() >= rows) {
                     wrongIndex = true;
@@ -2756,5 +2757,63 @@ void tst_QSortFilterProxyModel::task252507_mapFromToSource()
     QCOMPARE(proxy.mapFromSource(proxy.index(6, 2)), QModelIndex());
 }
 
+static QStandardItem *addEntry(QStandardItem* pParent, const QString &description)
+{
+    QStandardItem* pItem = new QStandardItem(description);
+    pParent->appendRow(pItem);
+    return pItem;
+}
+
+
+void tst_QSortFilterProxyModel::task255652_removeRowsRecursive()
+{
+    QStandardItemModel pModel;
+    QStandardItem *pItem1    = new QStandardItem("root");
+    pModel.appendRow(pItem1);
+    QList<QStandardItem *> items;
+
+    QStandardItem *pItem11   = addEntry(pItem1,"Sub-heading");
+    items << pItem11;
+    QStandardItem *pItem111 = addEntry(pItem11,"A");
+    items << pItem111;
+    items << addEntry(pItem111,"A1");
+    items << addEntry(pItem111,"A2");
+    QStandardItem *pItem112 = addEntry(pItem11,"B");
+    items << pItem112;
+    items << addEntry(pItem112,"B1");
+    items << addEntry(pItem112,"B2");
+    QStandardItem *pItem1123 = addEntry(pItem112,"B3");
+    items << pItem1123;
+    items << addEntry(pItem1123,"B3-");
+
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(&pModel);
+
+    QList<QPersistentModelIndex> sourceIndexes;
+    QList<QPersistentModelIndex> proxyIndexes;
+    foreach (QStandardItem *item, items) {
+        QModelIndex idx = item->index();
+        sourceIndexes << idx;
+        proxyIndexes << proxy.mapFromSource(idx);
+    }
+
+    foreach (const QPersistentModelIndex &pidx, sourceIndexes)
+        QVERIFY(pidx.isValid());
+    foreach (const QPersistentModelIndex &pidx, proxyIndexes)
+        QVERIFY(pidx.isValid());
+
+    QList<QStandardItem*> itemRow = pItem1->takeRow(0);
+
+    QCOMPARE(itemRow.count(), 1);
+    QCOMPARE(itemRow.first(), pItem11);
+
+    foreach (const QPersistentModelIndex &pidx, sourceIndexes)
+        QVERIFY(!pidx.isValid());
+    foreach (const QPersistentModelIndex &pidx, proxyIndexes)
+        QVERIFY(!pidx.isValid());
+
+    delete pItem11;
+}
+
 QTEST_MAIN(tst_QSortFilterProxyModel)
 #include "tst_qsortfilterproxymodel.moc"
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index 4fa3dc4..d8c21ac 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -1078,8 +1078,8 @@ void tst_QSqlDatabase::recordMySQL()
     FieldDef("bigint unsigned", QVariant::ULongLong, Q_UINT64_C(18446744073709551615)),
     FieldDef("float", QVariant::Double,	    1.12345),
     FieldDef("double", QVariant::Double,	    1.123456789),
-    FieldDef("decimal(10, 9)", QVariant::String,1.123456789),
-    FieldDef("numeric(5, 2)", QVariant::String, 123.67),
+    FieldDef("decimal(10, 9)", QVariant::Double,1.123456789),
+    FieldDef("numeric(5, 2)", QVariant::Double, 123.67),
     FieldDef("date", QVariant::Date,	    QDate::currentDate()),
     FieldDef("datetime", QVariant::DateTime,   dt),
     FieldDef("timestamp", QVariant::DateTime,  dt, false),
@@ -1616,16 +1616,17 @@ void tst_QSqlDatabase::precisionPolicy()
         QSKIP("Driver or database doesn't support setting precision policy", SkipSingle);
 
     // Create a test table with some data
-    QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id smallint, num numeric(20,0))").arg(tableName)));
+    QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id smallint, num numeric(18,5))").arg(tableName)));
     QVERIFY_SQL(q, prepare(QString("INSERT INTO %1 VALUES (?, ?)").arg(tableName)));
     q.bindValue(0, 1);
     q.bindValue(1, 123);
     QVERIFY_SQL(q, exec());
     q.bindValue(0, 2);
-    q.bindValue(1, QString("18500000000000000000"));
+    q.bindValue(1, QString("1850000000000.0001"));
     QVERIFY_SQL(q, exec());
 
     // These are expected to pass
+    q.setNumericalPrecisionPolicy(QSql::HighPrecision);
     QString query = QString("SELECT num FROM %1 WHERE id = 1").arg(tableName);
     QVERIFY_SQL(q, exec(query));
     QVERIFY_SQL(q, next());
@@ -1653,7 +1654,7 @@ void tst_QSqlDatabase::precisionPolicy()
     QVERIFY_SQL(q, exec(query));
     QVERIFY_SQL(q, next());
     QCOMPARE(q.value(0).type(), QVariant::Double);
-    QCOMPARE(q.value(0).toDouble(), QString("18500000000000000000").toDouble());
+    QCOMPARE(q.value(0).toDouble(), QString("1850000000000.0001").toDouble());
 
     // Postgres returns invalid QVariants on overflow
     q.setNumericalPrecisionPolicy(QSql::HighPrecision);
@@ -1662,14 +1663,19 @@ void tst_QSqlDatabase::precisionPolicy()
     QCOMPARE(q.value(0).type(), QVariant::String);
 
     q.setNumericalPrecisionPolicy(QSql::LowPrecisionInt64);
+    QEXPECT_FAIL("QOCI", "Oracle fails here, to retrieve next", Continue);
     QVERIFY_SQL(q, exec(query));
     QVERIFY_SQL(q, next());
-    QCOMPARE(q.value(0).type(), QVariant::Invalid);
+    QCOMPARE(q.value(0).type(), QVariant::LongLong);
 
-    q.setNumericalPrecisionPolicy(QSql::LowPrecisionInt32);
-    QVERIFY_SQL(q, exec(query));
-    QVERIFY_SQL(q, next());
-    QCOMPARE(q.value(0).type(), QVariant::Invalid);
+    QSql::NumericalPrecisionPolicy oldPrecision= db.numericalPrecisionPolicy();
+    db.setNumericalPrecisionPolicy(QSql::LowPrecisionDouble);
+    QSqlQuery q2(db);
+    q2.exec(QString("SELECT num FROM %1 WHERE id = 2").arg(tableName));
+    QVERIFY_SQL(q2, exec(query));
+    QVERIFY_SQL(q2, next());
+    QCOMPARE(q2.value(0).type(), QVariant::Double);
+    db.setNumericalPrecisionPolicy(oldPrecision);
 }
 
 // This test needs a ODBC data source containing MYSQL in it's name
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 84bda92..8067554 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -135,6 +135,7 @@ private slots:
 
     void rootItemFlags();
     void treeDragAndDrop();
+    void removeRowsAndColumns();
 
 private:
     QAbstractItemModel *m_model;
@@ -1403,7 +1404,7 @@ bool tst_QStandardItemModel::compareItems(QStandardItem *item1, QStandardItem *i
         return true;
     if (!item1 || !item2)
         return false;
-    if (item1->text() != item2->text()){  
+    if (item1->text() != item2->text()){
         qDebug() << item1->text() << item2->text();
         return false;
     }
@@ -1606,6 +1607,52 @@ void tst_QStandardItemModel::treeDragAndDrop()
     }
 }
 
+void tst_QStandardItemModel::removeRowsAndColumns()
+{
+#define VERIFY_MODEL \
+    for (int c = 0; c < col_list.count(); c++) \
+        for (int r = 0; r < row_list.count(); r++) \
+            QCOMPARE(model.item(r,c)->text() , row_list[r] + "x" + col_list[c]);
+
+    QVector<QString> row_list = QString("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20").split(',').toVector();
+    QVector<QString> col_list = row_list;
+    QStandardItemModel model;
+    for (int c = 0; c < col_list.count(); c++)
+        for (int r = 0; r < row_list.count(); r++)
+            model.setItem(r, c, new QStandardItem(row_list[r] + "x" + col_list[c]));
+    VERIFY_MODEL
+
+    row_list.remove(3);
+    model.removeRow(3);
+    VERIFY_MODEL
+
+    col_list.remove(5);
+    model.removeColumn(5);
+    VERIFY_MODEL
+
+    row_list.remove(2, 5);
+    model.removeRows(2, 5);
+    VERIFY_MODEL
+
+    col_list.remove(1, 6);
+    model.removeColumns(1, 6);
+    VERIFY_MODEL
+
+    QList<QStandardItem *> row_taken = model.takeRow(6);
+    QCOMPARE(row_taken.count(), col_list.count());
+    for (int c = 0; c < col_list.count(); c++)
+        QCOMPARE(row_taken[c]->text() , row_list[6] + "x" + col_list[c]);
+    row_list.remove(6);
+    VERIFY_MODEL
+
+    QList<QStandardItem *> col_taken = model.takeColumn(10);
+    QCOMPARE(col_taken.count(), row_list.count());
+    for (int r = 0; r < row_list.count(); r++)
+        QCOMPARE(col_taken[r]->text() , row_list[r] + "x" + col_list[10]);
+    col_list.remove(10);
+    VERIFY_MODEL
+}
+
 
 QTEST_MAIN(tst_QStandardItemModel)
 #include "tst_qstandarditemmodel.moc"
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index cb30f83..46e9edc 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -58,6 +58,7 @@
 #include <qcdestyle.h>
 #include <qmotifstyle.h>
 #include <qcommonstyle.h>
+#include <qproxystyle.h>
 #include <qstylefactory.h>
 
 #include <qimagereader.h>
@@ -131,6 +132,7 @@ private slots:
     void testWindowsCEStyle();
     void testWindowsMobileStyle();
     void testStyleFactory();
+    void testProxyStyle();
     void pixelMetric();
     void progressBarChangeStyle();
     void defaultFont();
@@ -213,6 +215,44 @@ void tst_QStyle::testStyleFactory()
     }
 }
 
+class CustomProxy : public QProxyStyle
+{
+    virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
+                            const QWidget *widget = 0) const
+    {
+        if (metric == QStyle::PM_ButtonIconSize)
+            return 13;
+        return QProxyStyle::pixelMetric(metric, option, widget);
+    }
+};
+
+void tst_QStyle::testProxyStyle()
+{
+    QProxyStyle *proxyStyle = new QProxyStyle();
+    QVERIFY(proxyStyle->baseStyle());
+    QStyle *style = new QWindowsStyle;
+    QVERIFY(style->proxy() == style);
+
+    proxyStyle->setBaseStyle(style);
+    QVERIFY(style->proxy() == proxyStyle);
+    QVERIFY(style->parent() == proxyStyle);
+    QVERIFY(proxyStyle->baseStyle() == style);
+
+    testAllFunctions(proxyStyle);
+    proxyStyle->setBaseStyle(0);
+    QVERIFY(proxyStyle->baseStyle());
+    qApp->setStyle(proxyStyle);
+
+    QProxyStyle doubleProxy(new QProxyStyle(new QWindowsStyle()));
+    testAllFunctions(&doubleProxy);
+
+    CustomProxy customStyle;
+    QLineEdit edit;
+    edit.setStyle(&customStyle);
+    QVERIFY(!customStyle.parent());
+    QVERIFY(edit.style()->pixelMetric(QStyle::PM_ButtonIconSize) == 13);
+}
+
 void tst_QStyle::drawItemPixmap()
 {
     testWidget->resize(300, 300);
@@ -310,7 +350,7 @@ void tst_QStyle::testAllFunctions(QStyle *style)
     testScrollBarSubControls(style);
 }
 
-void tst_QStyle::testScrollBarSubControls(QStyle *style)
+void tst_QStyle::testScrollBarSubControls(QStyle *)
 {
 #ifdef Q_OS_WINCE_WM
     if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone())
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro
index e52bb7a..9c07e76 100644
--- a/tests/auto/qtextcodec/test/test.pro
+++ b/tests/auto/qtextcodec/test/test.pro
@@ -6,7 +6,7 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+   DEFINES += SRCDIR=\\\"\\\"
+} else {
+   DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
-
-
-
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index 97c409b..1802c3e 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -74,6 +74,9 @@ private slots:
     void utf8Codec_data();
     void utf8Codec();
 
+    void utf8bom_data();
+    void utf8bom();
+
     void utfHeaders_data();
     void utfHeaders();
 
@@ -92,8 +95,8 @@ void tst_QTextCodec::toUnicode_data()
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QString>("codecName");
 
-    QTest::newRow( "korean-eucKR" ) << "korean.txt" << "eucKR";
-    QTest::newRow( "UTF-8" ) << "utf8.txt" << "UTF-8";
+    QTest::newRow( "korean-eucKR" ) << SRCDIR "korean.txt" << "eucKR";
+    QTest::newRow( "UTF-8" ) << SRCDIR "utf8.txt" << "UTF-8";
 }
 
 void tst_QTextCodec::toUnicode()
@@ -234,7 +237,7 @@ void tst_QTextCodec::fromUnicode()
 
 void tst_QTextCodec::toUnicode_codecForHtml()
 {
-    QFile file(QString("QT4-crashtest.txt"));
+    QFile file(QString(SRCDIR "QT4-crashtest.txt"));
     QVERIFY(file.open(QFile::ReadOnly));
 
     QByteArray data = file.readAll();
@@ -1513,6 +1516,63 @@ void tst_QTextCodec::utf8Codec()
     QCOMPARE(str, res);
 }
 
+void tst_QTextCodec::utf8bom_data()
+{
+    QTest::addColumn<QByteArray>("data");
+    QTest::addColumn<QString>("result");
+
+    QTest::newRow("nobom")
+        << QByteArray("\302\240", 2)
+        << QString("\240");
+
+    {
+        static const ushort data[] = { 0x201d };
+        QTest::newRow("nobom 2")
+            << QByteArray("\342\200\235", 3)
+            << QString::fromUtf16(data, sizeof(data)/sizeof(short));
+    }
+
+    {
+        static const ushort data[] = { 0xf000 };
+        QTest::newRow("bom1")
+            << QByteArray("\357\200\200", 3)
+            << QString::fromUtf16(data, sizeof(data)/sizeof(short));
+    }
+
+    {
+        static const ushort data[] = { 0xfec0 };
+        QTest::newRow("bom2")
+            << QByteArray("\357\273\200", 3)
+            << QString::fromUtf16(data, sizeof(data)/sizeof(short));
+    }
+
+    {
+        QTest::newRow("normal-bom")
+            << QByteArray("\357\273\277a", 4)
+            << QString("a");
+    }
+
+    {
+        static const ushort data[] = { 0x61, 0xfeff, 0x62 };
+        QTest::newRow("middle-bom")
+            << QByteArray("a\357\273\277b", 5)
+            << QString::fromUtf16(data, sizeof(data)/sizeof(short));
+    }
+}
+
+void tst_QTextCodec::utf8bom()
+{
+    QFETCH(QByteArray, data);
+    QFETCH(QString, result);
+
+    QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8
+    Q_ASSERT(codec);
+
+    QCOMPARE(codec->toUnicode(data.constData(), data.length(), 0), result);
+
+    QTextCodec::ConverterState state;
+    QCOMPARE(codec->toUnicode(data.constData(), data.length(), &state), result);
+}
 
 void tst_QTextCodec::utfHeaders_data()
 {
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
index f92e30f..f8c7cdf 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -133,7 +133,7 @@ void tst_QTextOdfWriter::testWriteParagraph_data()
     QTest::newRow("tab") << "word\ttab x" <<
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">word<text:tab/>tab x</text:span></text:p>";
     QTest::newRow("tab2") << "word\t\ttab\tx" <<
-        "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">word<text:tab text:tab-ref=\"2\"/>tab<text:tab/>x</text:span></text:p>";
+        "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">word<text:tab/><text:tab/>tab<text:tab/>x</text:span></text:p>";
     QTest::newRow("misc") << "foobar   word\ttab x" <<
         "<text:p text:style-name=\"p1\"><text:span text:style-name=\"c0\">foobar <text:s text:c=\"2\"/>word<text:tab/>tab x</text:span></text:p>";
     QTest::newRow("misc2") << "\t     \tFoo" <<
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index 358b4b6..9573957 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -552,8 +552,15 @@ void tst_QTextStream::generateLineData(bool for_QString)
     QTest::newRow("threelines/crlf/crlf/crlf") << QByteArray("ole\r\ndole\r\ndoffen\r\n") << (QStringList() << "ole" << "dole" << "doffen");
     QTest::newRow("threelines/crlf/crlf/nothing") << QByteArray("ole\r\ndole\r\ndoffen") << (QStringList() << "ole" << "dole" << "doffen");
 
-    // utf-16
     if (!for_QString) {
+        // utf-8
+        QTest::newRow("utf8/twolines")
+            << QByteArray("\xef\xbb\xbf"
+                          "\x66\x67\x65\x0a"
+                          "\x66\x67\x65\x0a", 11)
+            << (QStringList() << "fge" << "fge");
+
+        // utf-16
         // one line
         QTest::newRow("utf16-BE/nothing")
             << QByteArray("\xfe\xff"
@@ -593,6 +600,18 @@ void tst_QTextStream::generateLineData(bool for_QString)
                           "\xe5\x00\x67\x00\x65\x00\x0a\x00"
                           "\xe5\x00\x67\x00\x65\x00\x0a\x00", 26)
             << (QStringList() << "\345ge" << "\345ge" << "\345ge");
+
+        // utf-32
+        QTest::newRow("utf32-BE/twolines")
+            << QByteArray("\x00\x00\xfe\xff"
+                          "\x00\x00\x00\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a"
+                          "\x00\x00\x00\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a", 36)
+            << (QStringList() << "\345ge" << "\345ge");
+        QTest::newRow("utf32-LE/twolines")
+            << QByteArray("\xff\xfe\x00\x00"
+                          "\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a\x00\x00\x00"
+                          "\xe5\x00\x00\x00\x67\x00\x00\x00\x65\x00\x00\x00\x0a\x00\x00\x00", 36)
+            << (QStringList() << "\345ge" << "\345ge");
     }
 
     // partials
diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/qtransform/tst_qtransform.cpp
index 74c405e..99a449a 100644
--- a/tests/auto/qtransform/tst_qtransform.cpp
+++ b/tests/auto/qtransform/tst_qtransform.cpp
@@ -603,6 +603,13 @@ void tst_QTransform::types()
                  1.0f, 0.0f, 0.0f,
                  0.0f, 0.0f, 2.0f);
     QCOMPARE(m3.type(), QTransform::TxProject);
+
+    QTransform m4;
+    m4.scale(5, 5);
+    m4.translate(4, 2);
+    m4.rotate(45);
+
+    QCOMPARE(m4.type(), QTransform::TxRotate);
 }
 
 
@@ -647,7 +654,7 @@ void tst_QTransform::transform()
     d.rotate(30);
     e.shear(0.5, 0.5);
 
-    QCOMPARE(t, e * d * c * b * a);
+    QVERIFY(qFuzzyCompare(t, e * d * c * b * a));
 }
 
 void tst_QTransform::mapEmptyPath()
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 0ede920..2d26914 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -2449,14 +2449,22 @@ void tst_QVariant::saveLoadCustomTypes()
 
 void tst_QVariant::url()
 {
-    QUrl url("http://www.trolltech.com");
+    QString str("http://www.trolltech.com");
+    QUrl url(str);
 
-    QVariant v(url);
+    QVariant v(url); //built with a QUrl
 
     QVariant v2 = v;
 
-    QVERIFY(v2.toUrl() == url);
+    QVariant v3(str); //built with a QString
 
+    QCOMPARE(v2.toUrl(), url);
+    QVERIFY(qVariantCanConvert<QUrl>(v3));
+    QCOMPARE(v2.toUrl(), v3.toUrl());
+
+    QVERIFY(qVariantCanConvert<QString>(v2));
+    QCOMPARE(v2.toString(), str);
+    QCOMPARE(v3.toString(), str);
 }
 
 void tst_QVariant::globalColor()
diff --git a/tests/auto/qwebelement/.gitignore b/tests/auto/qwebelement/.gitignore
new file mode 100644
index 0000000..01bbb96
--- /dev/null
+++ b/tests/auto/qwebelement/.gitignore
@@ -0,0 +1 @@
+tst_qwebpage
diff --git a/tests/auto/qwebelement/dummy.cpp b/tests/auto/qwebelement/dummy.cpp
new file mode 100644
index 0000000..2a34bb9
--- /dev/null
+++ b/tests/auto/qwebelement/dummy.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 <QtTest/QtTest>
+
+QTEST_NOOP_MAIN
+
diff --git a/tests/auto/qwebelement/qwebelement.pro b/tests/auto/qwebelement/qwebelement.pro
new file mode 100644
index 0000000..ac809b8
--- /dev/null
+++ b/tests/auto/qwebelement/qwebelement.pro
@@ -0,0 +1,14 @@
+load(qttest_p4)
+contains(QT_CONFIG,webkit) {
+    DEFINES += QTEST_WEBKIT
+    QT += webkit network
+    isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
+    isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
+
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebelement
+    VPATH += $$TESTDIR
+    include($$TESTDIR/qwebelement.pro)
+} else {
+    SOURCES += dummy.cpp
+}
+
diff --git a/tests/auto/qwebhistoryinterface/.gitignore b/tests/auto/qwebhistoryinterface/.gitignore
new file mode 100644
index 0000000..01bbb96
--- /dev/null
+++ b/tests/auto/qwebhistoryinterface/.gitignore
@@ -0,0 +1 @@
+tst_qwebpage
diff --git a/tests/auto/qwebhistoryinterface/dummy.cpp b/tests/auto/qwebhistoryinterface/dummy.cpp
new file mode 100644
index 0000000..2a34bb9
--- /dev/null
+++ b/tests/auto/qwebhistoryinterface/dummy.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite 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 <QtTest/QtTest>
+
+QTEST_NOOP_MAIN
+
diff --git a/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
new file mode 100644
index 0000000..7218f52
--- /dev/null
+++ b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
@@ -0,0 +1,14 @@
+load(qttest_p4)
+contains(QT_CONFIG,webkit) {
+    DEFINES += QTEST_WEBKIT
+    QT += webkit network
+    isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
+    isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
+
+    TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface
+    VPATH += $$TESTDIR
+    include($$TESTDIR/qwebhistoryinterface.pro)
+} else {
+    SOURCES += dummy.cpp
+}
+
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 041aa7a..85d7de1 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -288,6 +288,7 @@ private slots:
     void render_systemClip3_data();
     void render_systemClip3();
     void render_task252837();
+    void render_worldTransform();
 
     void setContentsMargins();
 
@@ -7151,6 +7152,99 @@ void tst_QWidget::render_task252837()
     // Please do not crash.
     widget.render(&painter);
 }
+
+void tst_QWidget::render_worldTransform()
+{
+    class MyWidget : public QWidget
+    { public:
+        void paintEvent(QPaintEvent *)
+        {
+            QPainter painter(this);
+            // Make sure world transform is identity.
+            QCOMPARE(painter.worldTransform(), QTransform());
+
+            // Make sure device transform is correct.
+            const QPoint widgetOffset = geometry().topLeft();
+            QTransform expectedDeviceTransform = QTransform::fromTranslate(105, 5);
+            expectedDeviceTransform.rotate(90);
+            expectedDeviceTransform.translate(widgetOffset.x(), widgetOffset.y());
+            QCOMPARE(painter.deviceTransform(), expectedDeviceTransform);
+
+            // Set new world transform.
+            QTransform newWorldTransform = QTransform::fromTranslate(10, 10);
+            newWorldTransform.rotate(90);
+            painter.setWorldTransform(newWorldTransform);
+            QCOMPARE(painter.worldTransform(), newWorldTransform);
+
+            // Again, check device transform.
+            expectedDeviceTransform.translate(10, 10);
+            expectedDeviceTransform.rotate(90);
+            QCOMPARE(painter.deviceTransform(), expectedDeviceTransform);
+
+            painter.fillRect(QRect(0, 0, 20, 10), Qt::green);
+        }
+    };
+
+    MyWidget widget;
+    widget.setFixedSize(100, 100);
+    widget.setPalette(Qt::red);
+    widget.setAutoFillBackground(true);
+
+    MyWidget child;
+    child.setParent(&widget);
+    child.move(50, 50);
+    child.setFixedSize(50, 50);
+    child.setPalette(Qt::blue);
+    child.setAutoFillBackground(true);
+
+    QImage image(QSize(110, 110), QImage::Format_RGB32);
+    image.fill(QColor(Qt::black).rgb());
+
+    QPainter painter(&image);
+    painter.translate(105, 5);
+    painter.rotate(90);
+
+    const QTransform worldTransform = painter.worldTransform();
+    const QTransform deviceTransform = painter.deviceTransform();
+
+    // Render widgets onto image.
+    widget.render(&painter);
+#ifdef RENDER_DEBUG
+    image.save("render_worldTransform_image.png");
+#endif
+
+    // Ensure the transforms are unchanged after render.
+    QCOMPARE(painter.worldTransform(), painter.worldTransform());
+    QCOMPARE(painter.deviceTransform(), painter.deviceTransform());
+    painter.end();
+
+    // Paint expected image.
+    QImage expected(QSize(110, 110), QImage::Format_RGB32);
+    expected.fill(QColor(Qt::black).rgb());
+
+    QPainter expectedPainter(&expected);
+    expectedPainter.translate(105, 5);
+    expectedPainter.rotate(90);
+    expectedPainter.save();
+    expectedPainter.fillRect(widget.rect(),Qt::red);
+    expectedPainter.translate(10, 10);
+    expectedPainter.rotate(90);
+    expectedPainter.fillRect(QRect(0, 0, 20, 10), Qt::green);
+    expectedPainter.restore();
+    expectedPainter.translate(50, 50);
+    expectedPainter.fillRect(child.rect(),Qt::blue);
+    expectedPainter.translate(10, 10);
+    expectedPainter.rotate(90);
+    expectedPainter.fillRect(QRect(0, 0, 20, 10), Qt::green);
+    expectedPainter.end();
+
+#ifdef RENDER_DEBUG
+    expected.save("render_worldTransform_expected.png");
+#endif
+
+    QCOMPARE(image, expected);
+}
+
 void tst_QWidget::setContentsMargins()
 {
     QLabel label("why does it always rain on me?");
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 603e730..eca9aa6 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -101,7 +101,7 @@ inline bool qCompare
         variance = 0.001;
     }
     else if (r1.unit == "ticks") {
-        variance = 0.0001;
+        variance = 0.001;
     }
     if (variance == 0.) {
         /* No variance allowed - compare whole string */
diff --git a/tests/auto/uiloader/baseline/css_task255849_downarrow.ui b/tests/auto/uiloader/baseline/css_task255849_downarrow.ui
new file mode 100644
index 0000000..d3e99b1
--- /dev/null
+++ b/tests/auto/uiloader/baseline/css_task255849_downarrow.ui
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>275</width>
+    <height>175</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">/*  Some widget were not displaying the arrow if only the arrow was set */
+*::down-arrow { image: url(&quot;images/arrow-down.png&quot;) }
+*::up-arrow { image: url(&quot;images/arrow-up.png&quot;) }
+
+
+</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QComboBox" name="comboBox"/>
+   </item>
+   <item row="0" column="2" rowspan="5">
+    <widget class="QTreeWidget" name="treeWidget">
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <attribute name="headerShowSortIndicator" stdset="0">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="headerShowSortIndicator" stdset="0">
+      <bool>true</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>1</string>
+      </property>
+     </column>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QSpinBox" name="spinBox"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QToolButton" name="toolButton">
+     <property name="text">
+      <string>foo</string>
+     </property>
+     <property name="arrowType">
+      <enum>Qt::DownArrow</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QDoubleSpinBox" name="doubleSpinBox"/>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QPushButton" name="pushButton">
+     <property name="contextMenuPolicy">
+      <enum>Qt::NoContextMenu</enum>
+     </property>
+     <property name="text">
+      <string>PushButton</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/auto/uiloader/baseline/images/arrow-down.png b/tests/auto/uiloader/baseline/images/arrow-down.png
new file mode 100644
index 0000000..7c9274f
--- /dev/null
+++ b/tests/auto/uiloader/baseline/images/arrow-down.png
diff --git a/tests/auto/uiloader/baseline/images/arrow-up.png b/tests/auto/uiloader/baseline/images/arrow-up.png
new file mode 100644
index 0000000..758a0d1
--- /dev/null
+++ b/tests/auto/uiloader/baseline/images/arrow-up.png