Merge commit 'origin/4.6'

Conflicts:
	src/corelib/io/qfsfileengine.cpp
	src/network/access/qnetworkrequest.cpp
	tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp

24 files changed, 889 insertions, 43 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 92d29ae..4215e97 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -256,6 +256,7 @@ SUBDIRS += \
            qprinter \
            qprinterinfo \
            qprocess \
+	   qprocessenvironment \
            qprogressbar \
            qprogressdialog \
            qpropertyanimation \
@@ -442,7 +443,6 @@ SUBDIRS += \
            qsharedmemory \
            qsidebar \
            qsizegrip \
-           qsoftkeymanager \
            qsqldriver \
            qsystemsemaphore \
            qtconcurrentfilter \
@@ -477,6 +477,10 @@ embedded:!wince* {
     SUBDIRS += qtextpiecetable
 }
 
+symbian {
+    SUBDIRS += qsoftkeymanager
+}
+
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
 # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is
 # not respected by some test system, they just have a script which loop over
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
index 2d9e5dc..c105a97 100644
--- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
@@ -70,6 +70,7 @@ private slots:
     void openMailtoUrl();
     void openFileUrl_data();
     void openFileUrl();
+    void openMultipleFileUrls();
 #endif
     void handlers();
     void storageLocation_data();
@@ -197,6 +198,7 @@ void tst_qdesktopservices::openMailtoUrl()
     QFETCH(QUrl, url);
     QFETCH(bool, result);
     QCOMPARE(QDesktopServices::openUrl(url), result);
+    QTest::qWait(5000);
 }
 
 void tst_qdesktopservices::openFileUrl_data()
@@ -239,7 +241,19 @@ void tst_qdesktopservices::openFileUrl()
     QFETCH(QUrl, url);
     QFETCH(bool, result);
     QCOMPARE(QDesktopServices::openUrl(url), result);
-    QTest::qWait(15000);
+    QTest::qWait(5000);
+}
+
+void tst_qdesktopservices::openMultipleFileUrls()
+{
+#ifndef RUN_MANUAL_TESTS
+    QSKIP("Test disabled -- only for manual purposes", SkipAll);
+#endif
+
+    QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.bmp")), true);
+    QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.png")), true);
+    QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/others/noendofline.txt")), true); 
+    QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/installs/ErrRd.sisx")), true);      
 }
 #endif
 
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
index 7f03153..a3f0915 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -148,6 +148,7 @@ private slots:
     void task255471_decimalsValidation();
 
     void taskQTBUG_5008_textFromValueAndValidate();
+    void taskQTBUG_6670_selectAllWithPrefix();
 
 public slots:
     void valueChangedHelper(const QString &);
@@ -1084,5 +1085,16 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate()
     QCOMPARE(spinbox.text(), spinbox.locale().toString(spinbox.value()));
 }
 
+void tst_QDoubleSpinBox::taskQTBUG_6670_selectAllWithPrefix()
+{
+    DoubleSpinBox spin;
+    spin.setPrefix("$ ");
+    spin.lineEdit()->selectAll();
+    QTest::keyClick(spin.lineEdit(), Qt::Key_1);
+    QCOMPARE(spin.value(), 1.);
+    QTest::keyClick(spin.lineEdit(), Qt::Key_2);
+    QCOMPARE(spin.value(), 12.);
+}
+
 QTEST_MAIN(tst_QDoubleSpinBox)
 #include "tst_qdoublespinbox.moc"
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index b49395f..77172fe 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -513,9 +513,11 @@ void tst_QFileInfo::canonicalFilePath()
     QFileInfo info("/tmp/../../../../../../../../../../../../../../../../../");
     info.canonicalFilePath();
 
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     // This used to crash on Mac
     QFileInfo dontCrash(QLatin1String("/"));
     QCOMPARE(dontCrash.canonicalFilePath(), QLatin1String("/"));
+#endif
 
 #ifndef Q_OS_WIN
     // test symlinks
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index aa67ac5..1cb9f0d 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -89,6 +89,8 @@ private slots:
     void snakeParallelWithLayout();
     void parallelToHalfLayout();
     void globalSpacing();
+    void graphicsAnchorHandling();
+    void invalidHierarchyCheck();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -1196,7 +1198,7 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     QSizeF pref(20, 20);
     QSizeF max (50, 50);
 
-    /* 
+    /*
     create this layout, where a,b have controlType QSizePolicy::RadioButton
     c,d have controlType QSizePolicy::PushButton:
     +-------+
@@ -1243,9 +1245,9 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     scene.addItem(window);
 
     window->show();
-    QGraphicsView *view = new QGraphicsView(&scene);
-    view->resize(200, 200);
-    view->show();
+    QGraphicsView view(&scene);
+    view.resize(200, 200);
+    view.show();
 
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));    //radio
@@ -1264,10 +1266,13 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     window->setStyle(style);
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));
-    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));     
+    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));
     QCOMPARE(c->geometry(), QRectF(42, 47, 20, 20));
     QCOMPARE(d->geometry(), QRectF(63, 69, 20, 20));
     QCOMPARE(l->geometry(), QRectF(0,   0, 89, 98));
+
+    window->setStyle(0);
+    delete style;
 }
 
 
@@ -1776,7 +1781,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsOrder()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     // Bulk anchors
     l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
@@ -1801,7 +1807,6 @@ void tst_QGraphicsAnchorLayout::simplificationVsOrder()
 
     l->effectiveSizeHint(Qt::MinimumSize);
     if (hasSimplification) {
-        QEXPECT_FAIL("", "Sequential anchors cannot handle children of opposite directions", Continue);
         QCOMPARE(usedSimplex(l, Qt::Horizontal), false);
         QCOMPARE(usedSimplex(l, Qt::Vertical), false);
     }
@@ -1846,7 +1851,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsRedundance()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     l->addCornerAnchors(a, Qt::TopLeftCorner, l, Qt::TopLeftCorner);
     l->addCornerAnchors(a, Qt::BottomLeftCorner, l, Qt::BottomLeftCorner);
@@ -2016,6 +2022,61 @@ void tst_QGraphicsAnchorLayout::globalSpacing()
     QCOMPARE(newHSpacing, hSpacing);
 }
 
+void tst_QGraphicsAnchorLayout::graphicsAnchorHandling()
+{
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout();
+    QGraphicsWidget *a = createItem();
+
+    l->addAnchors(l, a);
+
+    QGraphicsAnchor *layoutAnchor = l->anchor(l, Qt::AnchorTop, l, Qt::AnchorBottom);
+    QGraphicsAnchor *itemAnchor = l->anchor(a, Qt::AnchorTop, a, Qt::AnchorBottom);
+    QGraphicsAnchor *invalidAnchor = l->anchor(a, Qt::AnchorTop, l, Qt::AnchorBottom);
+
+    // Ensure none of these anchors are accessible.
+    QVERIFY(layoutAnchor == 0);
+    QVERIFY(itemAnchor == 0);
+    QVERIFY(invalidAnchor == 0);
+
+    // Hook the anchors to a QObject
+    QObject object;
+    QGraphicsAnchor *userAnchor = l->anchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorBottom, a, Qt::AnchorBottom);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorRight, a, Qt::AnchorRight);
+    userAnchor->setParent(&object);
+    userAnchor = l->anchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    userAnchor->setParent(&object);
+
+    QCOMPARE(object.children().size(), 4);
+
+    // Delete layout, this will cause all anchors to be deleted internally.
+    // We expect the public QGraphicsAnchor instances to be deleted too.
+    delete l;
+    QCOMPARE(object.children().size(), 0);
+
+    delete a;
+}
+
+void tst_QGraphicsAnchorLayout::invalidHierarchyCheck()
+{
+    QGraphicsWidget window(0, Qt::Window);
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    window.setLayout(l);
+
+    QCOMPARE(l->count(), 0);
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    QVERIFY(!l->addAnchor(l, Qt::AnchorLeft, &window, Qt::AnchorLeft));
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    l->addAnchors(l, &window);
+    QTest::ignoreMessage(QtWarningMsg, "QGraphicsAnchorLayout::addAnchor(): "
+                         "You cannot add the parent of the layout to the layout.");
+    l->addCornerAnchors(l, Qt::TopLeftCorner, &window, Qt::TopLeftCorner);
+    QCOMPARE(l->count(), 0);
+}
 
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index baa1ba1..57dc90d 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -356,6 +356,8 @@ void tst_QGraphicsAnchorLayout1::testItemAt()
 
     QVERIFY( layout->itemAt(0) == widget2 );
 
+    delete widget1;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -460,6 +462,12 @@ void tst_QGraphicsAnchorLayout1::testAddAndRemoveAnchor()
 
     QCOMPARE( layout->count(), 0 );
 
+    delete widget1;
+    delete widget2;
+    delete widget3;
+    delete widget4;
+    delete widget5;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -1740,9 +1748,9 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
         QRectF actual = truncate(widgets[item.index]->geometry());
 
         QCOMPARE(actual, expected);
-        delete widgets[item.index];
     }
 
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2231,8 +2239,9 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
         const BasicLayoutTestResult item = result[i];
 
         QCOMPARE(widgets[item.index]->geometry(), item.rect);
-        delete widgets[item.index];
     }
+
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2360,7 +2369,7 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     QFETCH(bool, valid);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget = new TestWidget;
 
@@ -2370,11 +2379,11 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     layout->setAnchor( layout, Qt::AnchorTop, childWidget, Qt::AnchorTop, 10 );
     layout->setAnchor( childWidget, Qt::AnchorBottom, layout, Qt::AnchorBottom, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy and size
     childWidget->setSizePolicy( policy );
-    widget->setGeometry( QRectF( QPoint(0,0), size ) );
+    widget.setGeometry( QRectF( QPoint(0,0), size ) );
 
     QCOMPARE( layout->isValid() , valid );
 
@@ -2516,7 +2525,7 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2526,13 +2535,13 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy
     childWidget1->setSizePolicy( policy1 );
     childWidget2->setSizePolicy( policy2 );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {
@@ -2649,7 +2658,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2659,7 +2668,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: size hints
     childWidget1->setMinimumWidth( sizeHints1.value( Qt::MinimumSize ) );
@@ -2670,7 +2679,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     childWidget2->setPreferredWidth( sizeHints2.value( Qt::PreferredSize ) );
     childWidget2->setMaximumWidth( sizeHints2.value( Qt::MaximumSize ) );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index d216924..259df4d 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -196,8 +196,8 @@ void tst_QGraphicsEffect::source()
     // Uninstall effect on QGraphicsItem.
     effect->reset();
     item->setGraphicsEffect(0);
-    QVERIFY(!effect->source());
-    QVERIFY(effect->m_sourceChangedFlags & QGraphicsEffect::SourceDetached);
+    QVERIFY(!effect);
+    effect = new CustomEffect;
 
     // The item takes ownership and should delete the effect when destroyed.
     item->setGraphicsEffect(effect);
@@ -249,10 +249,10 @@ void tst_QGraphicsEffect::boundingRect()
     QCOMPARE(effect->boundingRect(), effect->boundingRectFor(itemRect));
 
     // Uninstall effect on QGraphicsItem.
+    QPointer<CustomEffect> ptr = effect;
     item->setGraphicsEffect(0);
-    QCOMPARE(effect->boundingRect(), QRectF());
+    QVERIFY(!ptr);
 
-    delete effect;
     delete item;
 }
 
@@ -343,11 +343,11 @@ void tst_QGraphicsEffect::draw()
     QCOMPARE(item->numRepaints, 0);
 
     // Make sure uninstalling an effect triggers a repaint.
+    QPointer<CustomEffect> ptr = effect;
     item->setGraphicsEffect(0);
+    QVERIFY(!ptr);
     QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 0);
     QCOMPARE(item->numRepaints, 1);
-    delete effect;
 }
 
 void tst_QGraphicsEffect::opacity()
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 9991ab4..7a0d40a 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -352,7 +352,7 @@ void tst_QGraphicsEffectSource::pixmapPadding_data()
 
     QTest::newRow("log,effectrect") << int(Qt::LogicalCoordinates)
                                     << int(QGraphicsEffect::PadToEffectiveBoundingRect)
-                                    << QSize(30, 30) << QPoint(-10, -10)
+                                    << QSize(20, 20) << QPoint(-5, -5)
                                     << 0x00000000u;
 
     QTest::newRow("dev,nopad") << int(Qt::DeviceCoordinates)
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 565a3e7..03a587a 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -233,6 +233,7 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
     {
         hints = painter->renderHints();
+        painter->setBrush(brush);
         painter->drawRect(boundingRect());
         ++repaints;
     }
@@ -247,6 +248,7 @@ public:
     QPainter::RenderHints hints;
     int repaints;
     QRectF br;
+    QBrush brush;
 };
 
 class tst_QGraphicsItem : public QObject
@@ -316,6 +318,7 @@ private slots:
     void childrenBoundingRect3();
     void group();
     void setGroup();
+    void setGroup2();
     void nestedGroups();
     void warpChildrenIntoGroup();
     void removeFromGroup();
@@ -1351,6 +1354,7 @@ void tst_QGraphicsItem::selected()
     view.setFixedSize(250, 250);
     view.show();
 
+    QTest::qWaitForWindowShown(&view);
     qApp->processEvents();
     qApp->processEvents();
 
@@ -3343,6 +3347,35 @@ void tst_QGraphicsItem::setGroup()
     QCOMPARE(rect->parentItem(), (QGraphicsItem *)0);
 }
 
+void tst_QGraphicsItem::setGroup2()
+{
+    QGraphicsScene scene;
+    QGraphicsItemGroup group;
+    scene.addItem(&group);
+
+    QGraphicsRectItem *rect = scene.addRect(50,50,50,50,Qt::NoPen,Qt::black);
+    rect->setTransformOriginPoint(50,50);
+    rect->setRotation(45);
+    rect->setScale(1.5);
+    rect->translate(20,20);
+    group.translate(-30,-40);
+    group.setRotation(180);
+    group.setScale(0.5);
+
+    QTransform oldSceneTransform = rect->sceneTransform();
+    rect->setGroup(&group);
+    QCOMPARE(rect->sceneTransform(), oldSceneTransform);
+
+    group.setRotation(20);
+    group.setScale(2);
+    rect->setRotation(90);
+    rect->setScale(0.8);
+
+    oldSceneTransform = rect->sceneTransform();
+    rect->setGroup(0);
+    QCOMPARE(rect->sceneTransform(), oldSceneTransform);
+}
+
 void tst_QGraphicsItem::nestedGroups()
 {
     QGraphicsItemGroup *group1 = new QGraphicsItemGroup;
@@ -7646,17 +7679,20 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     EventTester *item1 = new EventTester;
     item1->br = itemBoundingRect;
     item1->setPos(-200, -200);
+    item1->brush = Qt::red;
 
     EventTester *item2 = new EventTester;
     item2->br = itemBoundingRect;
     item2->setFlag(QGraphicsItem::ItemIgnoresTransformations);
     item2->setParentItem(item1);
     item2->setPos(200, 200);
+    item2->brush = Qt::green;
 
     EventTester *item3 = new EventTester;
     item3->br = itemBoundingRect;
     item3->setParentItem(item2);
     item3->setPos(80, 80);
+    item3->brush = Qt::blue;
 
     scene.addItem(item1);
     QTest::qWait(100);
@@ -7671,8 +7707,8 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem()
     item1->setGraphicsEffect(shadow);
     QTest::qWait(50);
 
-    // Make sure all items are repainted.
-    QCOMPARE(item1->repaints, 1);
+    // Make sure all visible items are repainted.
+    QCOMPARE(item1->repaints, 0);
     QCOMPARE(item2->repaints, 1);
     QCOMPARE(item3->repaints, 1);
 
@@ -7962,6 +7998,22 @@ void tst_QGraphicsItem::setGraphicsEffect()
     delete item;
     QVERIFY(!blurEffect);
     delete anotherItem;
+
+    // Ensure the effect is uninstalled when deleting it
+    item = new QGraphicsRectItem(0, 0, 10, 10);
+    blurEffect = new QGraphicsBlurEffect;
+    item->setGraphicsEffect(blurEffect);
+    delete blurEffect;
+    QVERIFY(!item->graphicsEffect());
+
+    // Ensure the existing effect is uninstalled and deleted when setting a null effect
+    blurEffect = new QGraphicsBlurEffect;
+    item->setGraphicsEffect(blurEffect);
+    item->setGraphicsEffect(0);
+    QVERIFY(!item->graphicsEffect());
+    QVERIFY(!blurEffect);
+
+    delete item;
 }
 
 void tst_QGraphicsItem::panel()
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index d3087dc..ab110e6 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -146,7 +146,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
 {
     // since the style will influence the results, we have to ensure
     // that the tests are run using the same style on all platforms
-#ifdef Q_WS_S60
+#if defined( Q_WS_S60 )|| defined (Q_WS_WINCE)
     QApplication::setStyle(new QWindowsStyle);
 #else
     QApplication::setStyle(new QPlastiqueStyle);
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 38abc3d..c5e57f7 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -280,6 +280,7 @@ private slots:
     void task160653_selectionChanged();
     void task250680_childClip();
     void taskQTBUG_5904_crashWithDeviceCoordinateCache();
+    void taskQT657_paintIntoCacheWithTransparentParts();
 };
 
 void tst_QGraphicsScene::initTestCase()
@@ -1462,6 +1463,7 @@ void tst_QGraphicsScene::focusItemLostFocus()
 class ClearTestItem : public QGraphicsRectItem
 {
 public:
+    ClearTestItem(QGraphicsItem *parent = 0) : QGraphicsRectItem(parent) {}
     ~ClearTestItem() { qDeleteAll(items); }
     QList<QGraphicsItem *> items;
 };
@@ -1486,6 +1488,11 @@ void tst_QGraphicsScene::clear()
     scene.addItem(secondItem);
     QCOMPARE(scene.items().at(0), firstItem);
     QCOMPARE(scene.items().at(1), secondItem);
+
+    ClearTestItem *thirdItem = new ClearTestItem(firstItem);
+    QGraphicsItem *forthItem = new QGraphicsRectItem(firstItem);
+    thirdItem->items += forthItem;
+
     // must not crash even if firstItem deletes secondItem
     scene.clear();
     QVERIFY(scene.items().isEmpty());
@@ -4264,5 +4271,43 @@ void tst_QGraphicsScene::taskQTBUG_5904_crashWithDeviceCoordinateCache()
     // No crash, then it passed!
 }
 
+void tst_QGraphicsScene::taskQT657_paintIntoCacheWithTransparentParts()
+{
+    QWidget *w = new QWidget();
+    w->setPalette(Qt::blue);
+    w->setGeometry(0, 0, 50, 50);
+
+    QGraphicsScene *scene = new QGraphicsScene();
+    QGraphicsView *view = new QGraphicsView(scene);
+
+    QGraphicsProxyWidget *proxy = scene->addWidget(w);
+    proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+    proxy->rotate(15);
+
+    view->show();
+    QTest::qWaitForWindowShown(view);
+    w->update(10,10,10,10);
+    QTest::qWait(50);
+
+    QPixmap pix;
+    QGraphicsItemPrivate* itemp = QGraphicsItemPrivate::get(proxy);
+    QPixmapCache::Key key = itemp->extraItemCache()->deviceData.value(view->viewport()).key;
+    QVERIFY(QPixmapCache::find(key, &pix));
+
+    QTransform t = proxy->sceneTransform();
+    // Map from scene coordinates to pixmap coordinates.
+    // X origin in the pixmap is the most-left point
+    // of the item's boundingRect in the scene.
+    qreal adjust = t.mapRect(proxy->boundingRect().toRect()).left();
+    QRect rect = t.mapRect(QRect(10, 10, 10, 10)).adjusted(-adjust, 0, -adjust + 1, 1);
+    QPixmap subpix = pix.copy(rect);
+
+    QImage im = subpix.toImage();
+    for(int i = 0; i < im.width(); i++) {
+        for(int j = 0; j < im.height(); j++)
+            QCOMPARE(qAlpha(im.pixel(i, j)), 255);
+    }
+}
+
 QTEST_MAIN(tst_QGraphicsScene)
 #include "tst_qgraphicsscene.moc"
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 47e21b8..d940a1b 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -169,6 +169,7 @@ private slots:
     void task236127_bspTreeIndexFails();
     void task243004_setStyleCrash();
     void task250119_shortcutContext();
+    void QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems();
 };
 
 
@@ -2882,6 +2883,37 @@ void tst_QGraphicsWidget::autoFillBackground()
     QCOMPARE(image.pixel(0, 0), color.rgb());
 }
 
+void tst_QGraphicsWidget::QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems()
+{
+    QGraphicsScene scene;
+    QGraphicsWidget* parent1 = new QGraphicsWidget;
+    QGraphicsWidget* child1_0 = new QGraphicsWidget;
+    QGraphicsWidget* child1_1 = new QGraphicsWidget;
+
+    QGraphicsWidget* parent2 = new QGraphicsWidget;
+
+    // Add the parent and child to the scene.
+    scene.addItem(parent1);
+    child1_0->setParentItem(parent1);
+    child1_1->setParentItem(parent1);
+
+    // Hide and show the child.
+    child1_0->setParentItem(NULL);
+    scene.removeItem(child1_0);
+
+    // Remove parent from the scene.
+    scene.removeItem(parent1);
+
+    delete child1_0;
+    delete child1_1;
+    delete parent1;
+
+    // Add an item into the scene.
+    scene.addItem(parent2);
+
+    //This should not crash
+}
+
 QTEST_MAIN(tst_QGraphicsWidget)
 #include "tst_qgraphicswidget.moc"
 
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index cb8f1e9..e165190 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -862,11 +862,18 @@ void tst_QListWidget::moveItemsPriv_data()
     QTest::newRow("Empty") << 0 << 0 << 0 << false;
     QTest::newRow("Overflow src") << 5 << 5 << 2 << false;
     QTest::newRow("Underflow src") << 5 << -1 << 2 << false;
-    QTest::newRow("Overflow dst") << 5 << 2 << 5 << false;
+    QTest::newRow("Overflow dst") << 5 << 2 << 6 << false;
     QTest::newRow("Underflow dst") << 5 << 2 << -1 << false;
     QTest::newRow("Same place") << 5 << 2 << 2 << false;
     QTest::newRow("Up") << 5 << 4 << 2 << true;
     QTest::newRow("Down") << 5 << 2 << 4 << true;
+    QTest::newRow("QTBUG-6532 assert") << 5 << 0 << 1 << false;
+    QTest::newRow("QTBUG-6565 to the end") << 5 << 3 << 5 << true;
+    QTest::newRow("Same place 2") << 2 << 0 << 1 << false;
+    QTest::newRow("swap") << 2 << 0 << 2 << true;
+    QTest::newRow("swap2") << 4 << 1 << 3 << true;
+    QTest::newRow("swap3") << 4 << 3 << 2 << true;
+    QTest::newRow("swap4") << 2 << 1 << 0 << true;
 }
 
 void tst_QListWidget::moveItemsPriv()
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 7cdfe46..af10ad1 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -82,7 +82,7 @@ private slots:
     void keyboardNavigation_data();
     void keyboardNavigation();
     void focus();
-	void overrideMenuAction();
+    void overrideMenuAction();
     void statusTip();
     void widgetActionFocus();
     void mouseActivation();
@@ -103,12 +103,14 @@ private slots:
     void task258920_mouseBorder();
     void setFixedWidth();
     void deleteActionInTriggered();
+    void pushButtonPopulateOnAboutToShow();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
     void onStatusMessageChanged(const QString &);
     void onStatusTipTimer();
     void deleteAction(QAction *a) { delete a; }
+    void populateMenu();
 private:
     void createActions();
     QMenu *menus[2], *lastMenu;
@@ -258,6 +260,15 @@ void tst_QMenu::onStatusMessageChanged(const QString &s)
     statustip=s;
 }
 
+void tst_QMenu::populateMenu(){
+    //just adds 3 dummy actions and a separator.
+        lastMenu->addAction("Foo");
+        lastMenu->addAction("Bar");
+        lastMenu->addAction("FooBar");
+        lastMenu->addSeparator();
+
+}
+
 
 //actual tests
 void
@@ -896,7 +907,29 @@ void tst_QMenu::deleteActionInTriggered()
     QVERIFY(!a);
 }
 
+void tst_QMenu::pushButtonPopulateOnAboutToShow()
+{
+    QPushButton b("Test PushButton");
+    b.setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
+    lastMenu = new QMenu;
+    b.setMenu(lastMenu);
+    const int scrNumber = QApplication::desktop()->screenNumber(&b);
+    connect(lastMenu, SIGNAL(aboutToShow()), this, SLOT(populateMenu()));
+    b.show();
+    const QRect screen = QApplication::desktop()->screenGeometry(scrNumber);
 
+    b.move(10, screen.bottom()-b.height()-5);
+    QTest::qWaitForWindowShown(&b);
+    QTimer::singleShot(300,lastMenu, SLOT(hide()));
+    QTest::mouseClick(&b, Qt::LeftButton, Qt::NoModifier, b.rect().center());
+    QVERIFY(!lastMenu->geometry().intersects(b.geometry()));
+
+    b.move(10, screen.bottom()-lastMenu->height()-5);
+    QTimer::singleShot(300,lastMenu, SLOT(hide()));
+    QTest::mouseClick(&b, Qt::LeftButton, Qt::NoModifier, b.rect().center());
+    QVERIFY(!lastMenu->geometry().intersects(b.geometry()));
+
+}
 
 
 QTEST_MAIN(tst_QMenu)
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index d2073d2..c534cce 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -3230,10 +3230,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig05()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig15()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig29()")));
-    if (sizeof(void *) >= 8) { //on 32bit isSignalConnected only works with the first 32 signals
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
-        QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
-    }
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig60()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     QObject::connect(&o, SIGNAL(sig00()), &o, SIGNAL(sig69()));
@@ -3287,6 +3285,8 @@ void tst_QObject::isSignalConnected()
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig04()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig21()")));
     QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig25()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig55()")));
+    QVERIFY(!priv->isSignalConnected(priv->signalIndex("sig61()")));
 #endif
 
     emit o.sig00();
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index 9775d36..c89a182 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -70,6 +70,7 @@ private slots:
     void remove();
     void clear();
     void pixmapKey();
+    void noLeak();
 };
 
 static QPixmapCache::KeyData* getPrivate(QPixmapCache::Key &key)
@@ -482,5 +483,23 @@ void tst_QPixmapCache::pixmapKey()
     QVERIFY(!getPrivate(key8));
 }
 
+extern int q_QPixmapCache_keyHashSize();
+
+void tst_QPixmapCache::noLeak()
+{
+    QPixmapCache::Key key;
+
+    int oldSize = q_QPixmapCache_keyHashSize();
+    for (int i = 0; i < 100; ++i) {
+        QPixmap pm(128, 128);
+        pm.fill(Qt::transparent);
+        key = QPixmapCache::insert(pm);
+        QPixmapCache::remove(key);
+    }
+    int newSize = q_QPixmapCache_keyHashSize();
+
+    QCOMPARE(oldSize, newSize);
+}
+
 QTEST_MAIN(tst_QPixmapCache)
 #include "tst_qpixmapcache.moc"
diff --git a/tests/auto/qprocessenvironment/qprocessenvironment.pro b/tests/auto/qprocessenvironment/qprocessenvironment.pro
new file mode 100644
index 0000000..398facc
--- /dev/null
+++ b/tests/auto/qprocessenvironment/qprocessenvironment.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+
+QT = core
+
+SOURCES  += tst_qprocessenvironment.cpp
diff --git a/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
new file mode 100644
index 0000000..1cde33c
--- /dev/null
+++ b/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -0,0 +1,265 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest>
+#include <QObject>
+#include <QProcessEnvironment>
+
+// Note:
+// in cross-platform tests, ALWAYS use UPPERCASE variable names
+// That's because on Windows, the variables are uppercased
+
+class tst_QProcessEnvironment: public QObject
+{
+    Q_OBJECT
+private slots:
+    void operator_eq();
+    void clearAndIsEmpty();
+    void insert();
+    void emptyNull();
+    void toStringList();
+
+    void caseSensitivity();
+    void systemEnvironment();
+    void putenv();
+};
+
+void tst_QProcessEnvironment::operator_eq()
+{
+    QProcessEnvironment e1;
+    QVERIFY(e1 == e1);
+    e1.clear();
+    QVERIFY(e1 == e1);
+
+    e1 = QProcessEnvironment();
+    QProcessEnvironment e2;
+    QVERIFY(e1 == e2);
+
+    e1.clear();
+    QVERIFY(e1 != e2);
+
+    e2.clear();
+
+    QVERIFY(e1 == e2);
+}
+
+void tst_QProcessEnvironment::clearAndIsEmpty()
+{
+    QProcessEnvironment e;
+    e.insert("FOO", "bar");
+    QVERIFY(!e.isEmpty());
+    e.clear();
+    QVERIFY(e.isEmpty());
+}
+
+void tst_QProcessEnvironment::insert()
+{
+    QProcessEnvironment e;
+    e.insert("FOO", "bar");
+    QVERIFY(!e.isEmpty());
+    QVERIFY(e.contains("FOO"));
+    QCOMPARE(e.value("FOO"), QString("bar"));
+
+    e.remove("FOO");
+    QVERIFY(!e.contains("FOO"));
+    QVERIFY(e.value("FOO").isNull());
+
+    e.clear();
+    QVERIFY(!e.contains("FOO"));
+}
+
+void tst_QProcessEnvironment::emptyNull()
+{
+    QProcessEnvironment e;
+
+    e.insert("FOO", "");
+    QVERIFY(e.contains("FOO"));
+    QVERIFY(e.value("FOO").isEmpty());
+    QVERIFY(!e.value("FOO").isNull());
+
+    e.insert("FOO", QString());
+    QVERIFY(e.contains("FOO"));
+    QVERIFY(e.value("FOO").isEmpty());
+    // don't test if it's NULL, since we shall not make a guarantee
+
+    e.remove("FOO");
+    QVERIFY(!e.contains("FOO"));
+}
+
+void tst_QProcessEnvironment::toStringList()
+{
+    QProcessEnvironment e;
+    QVERIFY(e.isEmpty());
+    QVERIFY(e.toStringList().isEmpty());
+
+    e.insert("FOO", "bar");
+    QStringList result = e.toStringList();
+    QVERIFY(!result.isEmpty());
+    QCOMPARE(result.length(), 1);
+    QCOMPARE(result.at(0), QString("FOO=bar"));
+
+    e.clear();
+    e.insert("BAZ", "");
+    result = e.toStringList();
+    QCOMPARE(result.at(0), QString("BAZ="));
+
+    e.insert("FOO", "bar");
+    e.insert("A", "bc");
+    e.insert("HELLO", "World");
+    result = e.toStringList();
+    QCOMPARE(result.length(), 4);
+
+    // order is not specified, so use contains()
+    QVERIFY(result.contains("FOO=bar"));
+    QVERIFY(result.contains("BAZ="));
+    QVERIFY(result.contains("A=bc"));
+    QVERIFY(result.contains("HELLO=World"));
+}
+
+void tst_QProcessEnvironment::caseSensitivity()
+{
+    QProcessEnvironment e;
+    e.insert("foo", "bar");
+
+#ifdef Q_OS_WIN
+    // on Windows, it's uppercased
+    QVERIFY(e.contains("foo"));
+    QVERIFY(e.contains("FOO"));
+    QVERIFY(e.contains("FoO"));
+
+    QCOMPARE(e.value("foo"), QString("bar"));
+    QCOMPARE(e.value("FOO"), QString("bar"));
+    QCOMPARE(e.value("FoO"), QString("bar"));
+
+    QStringList list = e.toStringList();
+    QCOMPARE(list.at(0), QString("FOO=bar"));
+#else
+    // otherwise, it's case sensitive
+    QVERIFY(e.contains("foo"));
+    QVERIFY(!e.contains("FOO"));
+
+    e.insert("FOO", "baz");
+    QVERIFY(e.contains("FOO"));
+    QCOMPARE(e.value("FOO"), QString("baz"));
+    QCOMPARE(e.value("foo"), QString("bar"));
+
+    QStringList list = e.toStringList();
+    QVERIFY(list.contains("foo=bar"));
+    QVERIFY(list.contains("FOO=baz"));
+#endif
+}
+
+void tst_QProcessEnvironment::systemEnvironment()
+{
+    static const char envname[] = "THIS_ENVIRONMENT_VARIABLE_HOPEFULLY_DOESNT_EXIST";
+    QByteArray path = qgetenv("PATH");
+    QByteArray nonexistant = qgetenv(envname);
+    QProcessEnvironment system = QProcessEnvironment::systemEnvironment();
+
+    QVERIFY(nonexistant.isNull());
+
+#ifdef Q_WS_WINCE
+    // Windows CE has no environment
+    QVERIFY(path.isEmpty());
+    QVERIFY(!system.contains("PATH"));
+    QVERIFY(system.isEmpty());
+#else
+    // all other system have environments
+    if (path.isEmpty())
+        QFAIL("Could not find the PATH environment variable -- please correct the test environment");
+
+    QVERIFY(system.contains("PATH"));
+    QCOMPARE(system.value("PATH"), QString::fromLocal8Bit(path));
+
+    QVERIFY(!system.contains(envname));
+
+# ifdef Q_OS_WIN
+    // check case-insensitive too
+    QVERIFY(system.contains("path"));
+    QCOMPARE(system.value("path"), QString::fromLocal8Bit(path));
+
+    QVERIFY(!system.contains(QString(envname).toLower()));
+# endif
+#endif
+}
+
+void tst_QProcessEnvironment::putenv()
+{
+#ifdef Q_WS_WINCE
+    QSKIP("Windows CE has no environment", SkipAll);
+#else
+    static const char envname[] = "WE_RE_SETTING_THIS_ENVIRONMENT_VARIABLE";
+    static bool testRan = false;
+
+    if (testRan)
+        QFAIL("You cannot run this test more than once, since we modify the environment");
+    testRan = true;
+
+    QByteArray valBefore = qgetenv(envname);
+    if (!valBefore.isNull())
+        QFAIL("The environment variable we set in the environment is already set! -- please correct the test environment");
+    QProcessEnvironment eBefore = QProcessEnvironment::systemEnvironment();
+
+    qputenv(envname, "Hello, World");
+    QByteArray valAfter = qgetenv(envname);
+    if (valAfter != "Hello, World")
+        QSKIP("Could not test: qputenv did not do its job", SkipAll);
+
+    QProcessEnvironment eAfter = QProcessEnvironment::systemEnvironment();
+
+    QVERIFY(!eBefore.contains(envname));
+    QVERIFY(eAfter.contains(envname));
+    QCOMPARE(eAfter.value(envname), QString("Hello, World"));
+
+# ifdef Q_OS_WIN
+    // check case-insensitive too
+    QString lower = envname;
+    lower = lower.toLower();
+    QVERIFY(!eBefore.contains(lower));
+    QVERIFY(eAfter.contains(lower));
+    QCOMPARE(eAfter.value(lower), QString("Hello, World"));
+# endif
+#endif
+}
+
+QTEST_MAIN(tst_QProcessEnvironment)
+
+#include "tst_qprocessenvironment.moc"
diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
index f72b6f7..4148594 100644
--- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp
@@ -756,12 +756,12 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
             ++failedProcesses;
     }
 
-    producer.waitForFinished(5000);
+    QVERIFY(producer.waitForFinished(5000));
 
     bool consumerFailed = false;
 
     while (!consumers.isEmpty()) {
-        consumers.first()->waitForFinished(2000);
+        QVERIFY(consumers.first()->waitForFinished(3000));
         if (consumers.first()->state() == QProcess::Running ||
             consumers.first()->exitStatus() != QProcess::NormalExit ||
             consumers.first()->exitCode() != 0) {
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index ed9206c..0cb08f9 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -73,6 +73,7 @@ private slots:
     void forwardDeclaration2();
     void memoryManagement();
     void downCast();
+    void functionCallDownCast();
     void upCast();
     void qobjectWeakManagement();
     void noSharedPointerFromWeakQObject();
@@ -503,6 +504,15 @@ void tst_QSharedPointer::downCast()
     QCOMPARE(DerivedData::derivedDestructorCounter, destructorCount + 1);
 }
 
+void functionDataByValue(QSharedPointer<Data> p) { Q_UNUSED(p); };
+void functionDataByRef(const QSharedPointer<Data> &p) { Q_UNUSED(p); };
+void tst_QSharedPointer::functionCallDownCast()
+{
+    QSharedPointer<DerivedData> p(new DerivedData());
+    functionDataByValue(p);
+    functionDataByRef(p);
+}
+
 void tst_QSharedPointer::upCast()
 {
     QSharedPointer<Data> baseptr = QSharedPointer<Data>(new DerivedData);
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index f840ca6..cb4e103 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -2493,7 +2493,6 @@ void tst_QSqlDatabase::oci_tables()
     QString systemTableName("system."+qTableName("mypassword"));
     QVERIFY_SQL(q, exec("CREATE TABLE "+systemTableName+"(name VARCHAR(20))"));
     QVERIFY(!db.tables().contains(systemTableName.toUpper()));
-    qDebug() << db.tables(QSql::SystemTables);
     QVERIFY(db.tables(QSql::SystemTables).contains(systemTableName.toUpper()));
 }
 
diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/qtouchevent/tst_qtouchevent.cpp
index f95a5c6..da8721c 100644
--- a/tests/auto/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp
@@ -48,6 +48,7 @@ public:
     QList<QTouchEvent::TouchPoint> touchBeginPoints, touchUpdatePoints, touchEndPoints;
     bool seenTouchBegin, seenTouchUpdate, seenTouchEnd;
     bool acceptTouchBegin, acceptTouchUpdate, acceptTouchEnd;
+    bool deleteInTouchBegin, deleteInTouchUpdate, deleteInTouchEnd;
 
     tst_QTouchEventWidget()
         : QWidget()
@@ -62,6 +63,7 @@ public:
         touchEndPoints.clear();
         seenTouchBegin = seenTouchUpdate = seenTouchEnd = false;
         acceptTouchBegin = acceptTouchUpdate = acceptTouchEnd = true;
+        deleteInTouchBegin = deleteInTouchUpdate = deleteInTouchEnd = false;
     }
 
     bool event(QEvent *event)
@@ -74,6 +76,8 @@ public:
             seenTouchBegin = !seenTouchBegin && !seenTouchUpdate && !seenTouchEnd;
             touchBeginPoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchBegin);
+            if (deleteInTouchBegin)
+                delete this;
             break;
         case QEvent::TouchUpdate:
             if (!seenTouchBegin) qWarning("TouchUpdate: have not seen TouchBegin");
@@ -81,6 +85,8 @@ public:
             seenTouchUpdate = seenTouchBegin && !seenTouchEnd;
             touchUpdatePoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchUpdate);
+            if (deleteInTouchUpdate)
+                delete this;
             break;
         case QEvent::TouchEnd:
             if (!seenTouchBegin) qWarning("TouchEnd: have not seen TouchBegin");
@@ -88,6 +94,8 @@ public:
             seenTouchEnd = seenTouchBegin && !seenTouchEnd;
             touchEndPoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchEnd);
+            if (deleteInTouchEnd)
+                delete this;
             break;
         default:
             return QWidget::event(event);
@@ -102,13 +110,21 @@ public:
     QList<QTouchEvent::TouchPoint> touchBeginPoints, touchUpdatePoints, touchEndPoints;
     bool seenTouchBegin, seenTouchUpdate, seenTouchEnd;
     bool acceptTouchBegin, acceptTouchUpdate, acceptTouchEnd;
+    bool deleteInTouchBegin, deleteInTouchUpdate, deleteInTouchEnd;
+    tst_QTouchEventGraphicsItem **weakpointer;
 
     tst_QTouchEventGraphicsItem()
-        : QGraphicsItem()
+        : QGraphicsItem(), weakpointer(0)
     {
         reset();
     }
 
+    ~tst_QTouchEventGraphicsItem()
+    {
+        if (weakpointer)
+            *weakpointer = 0;
+    }
+
     void reset()
     {
         touchBeginPoints.clear();
@@ -116,6 +132,7 @@ public:
         touchEndPoints.clear();
         seenTouchBegin = seenTouchUpdate = seenTouchEnd = false;
         acceptTouchBegin = acceptTouchUpdate = acceptTouchEnd = true;
+        deleteInTouchBegin = deleteInTouchUpdate = deleteInTouchEnd = false;
     }
 
     QRectF boundingRect() const { return QRectF(0, 0, 10, 10); }
@@ -131,6 +148,8 @@ public:
             seenTouchBegin = !seenTouchBegin && !seenTouchUpdate && !seenTouchEnd;
             touchBeginPoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchBegin);
+            if (deleteInTouchBegin)
+                delete this;
             break;
         case QEvent::TouchUpdate:
             if (!seenTouchBegin) qWarning("TouchUpdate: have not seen TouchBegin");
@@ -138,6 +157,8 @@ public:
             seenTouchUpdate = seenTouchBegin && !seenTouchEnd;
             touchUpdatePoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchUpdate);
+            if (deleteInTouchUpdate)
+                delete this;
             break;
         case QEvent::TouchEnd:
             if (!seenTouchBegin) qWarning("TouchEnd: have not seen TouchBegin");
@@ -145,6 +166,8 @@ public:
             seenTouchEnd = seenTouchBegin && !seenTouchEnd;
             touchEndPoints = static_cast<QTouchEvent *>(event)->touchPoints();
             event->setAccepted(acceptTouchEnd);
+            if (deleteInTouchEnd)
+                delete this;
             break;
         default:
             return QGraphicsItem::sceneEvent(event);
@@ -168,6 +191,8 @@ private slots:
     void basicRawEventTranslation();
     void multiPointRawEventTranslationOnTouchScreen();
     void multiPointRawEventTranslationOnTouchPad();
+    void deleteInEventHandler();
+    void deleteInRawEventTranslation();
 };
 
 void tst_QTouchEvent::touchDisabledByDefault()
@@ -496,7 +521,7 @@ void tst_QTouchEvent::touchUpdateAndEndNeverPropagate()
         res = QApplication::sendEvent(view.viewport(), &touchUpdateEvent);
         QVERIFY(res);
         // the scene accepts the event, since it found an item to send the event to
-        QVERIFY(touchUpdateEvent.isAccepted());
+        QVERIFY(!touchUpdateEvent.isAccepted());
         QVERIFY(child.seenTouchUpdate);
         QVERIFY(!root.seenTouchUpdate);
 
@@ -510,7 +535,7 @@ void tst_QTouchEvent::touchUpdateAndEndNeverPropagate()
         res = QApplication::sendEvent(view.viewport(), &touchEndEvent);
         QVERIFY(res);
         // the scene accepts the event, since it found an item to send the event to
-        QVERIFY(touchEndEvent.isAccepted());
+        QVERIFY(!touchEndEvent.isAccepted());
         QVERIFY(child.seenTouchEnd);
         QVERIFY(!root.seenTouchEnd);
     }
@@ -1059,6 +1084,225 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchPad()
     }
 }
 
+void tst_QTouchEvent::deleteInEventHandler()
+{
+    // QWidget
+    {
+        QWidget window;
+        tst_QTouchEventWidget *child1, *child2, *child3;
+        child1 = new tst_QTouchEventWidget;
+        child2 = new tst_QTouchEventWidget;
+        child3 = new tst_QTouchEventWidget;
+        child1->setParent(&window);
+        child2->setParent(&window);
+        child3->setParent(&window);
+        child1->setAttribute(Qt::WA_AcceptTouchEvents);
+        child2->setAttribute(Qt::WA_AcceptTouchEvents);
+        child3->setAttribute(Qt::WA_AcceptTouchEvents);
+        child1->deleteInTouchBegin = true;
+        child2->deleteInTouchUpdate = true;
+        child3->deleteInTouchEnd = true;
+
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        QTouchEvent touchBeginEvent(QEvent::TouchBegin,
+                                    QTouchEvent::TouchScreen,
+                                    Qt::NoModifier,
+                                    Qt::TouchPointPressed,
+                                    touchPoints);
+        QTouchEvent touchUpdateEvent(QEvent::TouchUpdate,
+                               QTouchEvent::TouchScreen,
+                               Qt::NoModifier,
+                               Qt::TouchPointStationary,
+                               touchPoints);
+        QTouchEvent touchEndEvent(QEvent::TouchEnd,
+                               QTouchEvent::TouchScreen,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased,
+                               touchPoints);
+        QWeakPointer<QWidget> p;
+        bool res;
+
+        touchBeginEvent.ignore();
+        p = child1;
+        res = QApplication::sendEvent(child1, &touchBeginEvent);
+        // event is handled, but widget should be deleted
+        QVERIFY(res && touchBeginEvent.isAccepted() && p.isNull());
+
+        touchBeginEvent.ignore();
+        p = child2;
+        res = QApplication::sendEvent(child2, &touchBeginEvent);
+        QVERIFY(res && touchBeginEvent.isAccepted() && !p.isNull());
+        touchUpdateEvent.ignore();
+        res = QApplication::sendEvent(child2, &touchUpdateEvent);
+        QVERIFY(res && touchUpdateEvent.isAccepted() && p.isNull());
+
+        touchBeginEvent.ignore();
+        p = child3;
+        res = QApplication::sendEvent(child3, &touchBeginEvent);
+        QVERIFY(res && touchBeginEvent.isAccepted() && !p.isNull());
+        touchUpdateEvent.ignore();
+        res = QApplication::sendEvent(child3, &touchUpdateEvent);
+        QVERIFY(res && touchUpdateEvent.isAccepted() && !p.isNull());
+        touchEndEvent.ignore();
+        res = QApplication::sendEvent(child3, &touchEndEvent);
+        QVERIFY(res && touchEndEvent.isAccepted() && p.isNull());
+    }
+
+    // QGraphicsView
+    {
+        QGraphicsScene scene;
+        QGraphicsView view(&scene);
+        tst_QTouchEventGraphicsItem *root, *child1, *child2, *child3;
+        root = new tst_QTouchEventGraphicsItem;
+        child1 = new tst_QTouchEventGraphicsItem;
+        child2 = new tst_QTouchEventGraphicsItem;
+        child3 = new tst_QTouchEventGraphicsItem;
+        child1->setParentItem(root);
+        child2->setParentItem(root);
+        child3->setParentItem(root);
+        child1->setZValue(1.);
+        child2->setZValue(0.);
+        child3->setZValue(-1.);
+        child1->setAcceptTouchEvents(true);
+        child2->setAcceptTouchEvents(true);
+        child3->setAcceptTouchEvents(true);
+        child1->deleteInTouchBegin = true;
+        child2->deleteInTouchUpdate = true;
+        child3->deleteInTouchEnd = true;
+
+        scene.addItem(root);
+        view.resize(200, 200);
+        view.fitInView(scene.sceneRect());
+
+        QTouchEvent::TouchPoint touchPoint(0);
+        touchPoint.setState(Qt::TouchPointPressed);
+        touchPoint.setPos(view.mapFromScene(child1->mapToScene(child1->boundingRect().center())));
+        touchPoint.setScreenPos(view.mapToGlobal(touchPoint.pos().toPoint()));
+        touchPoint.setScenePos(view.mapToScene(touchPoint.pos().toPoint()));
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(touchPoint);
+        QTouchEvent touchBeginEvent(QEvent::TouchBegin,
+                                    QTouchEvent::TouchScreen,
+                                    Qt::NoModifier,
+                                    Qt::TouchPointPressed,
+                                    touchPoints);
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        QTouchEvent touchUpdateEvent(QEvent::TouchUpdate,
+                               QTouchEvent::TouchScreen,
+                               Qt::NoModifier,
+                               Qt::TouchPointMoved,
+                               touchPoints);
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEndEvent(QEvent::TouchEnd,
+                               QTouchEvent::TouchScreen,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased,
+                               touchPoints);
+        bool res;
+
+        child1->weakpointer = &child1;
+        touchBeginEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchBeginEvent);
+        QVERIFY(res && touchBeginEvent.isAccepted() && !child1);
+        touchUpdateEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchUpdateEvent);
+        QVERIFY(res && touchUpdateEvent.isAccepted() && !child1);
+        touchEndEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchEndEvent);
+        QVERIFY(res && touchUpdateEvent.isAccepted() && !child1);
+
+        child2->weakpointer = &child2;
+        touchBeginEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchBeginEvent);
+        QVERIFY(res && touchBeginEvent.isAccepted() && child2);
+        touchUpdateEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchUpdateEvent);
+        QVERIFY(res && !touchUpdateEvent.isAccepted() && !child2);
+        touchEndEvent.ignore();
+        res = QApplication::sendEvent(view.viewport(), &touchEndEvent);
+        QVERIFY(res && !touchUpdateEvent.isAccepted() && !child2);
+
+        child3->weakpointer = &child3;
+        res = QApplication::sendEvent(view.viewport(), &touchBeginEvent);
+        QVERIFY(res && touchBeginEvent.isAccepted() && child3);
+        res = QApplication::sendEvent(view.viewport(), &touchUpdateEvent);
+        QVERIFY(res && !touchUpdateEvent.isAccepted() && child3);
+        res = QApplication::sendEvent(view.viewport(), &touchEndEvent);
+        QVERIFY(res && !touchEndEvent.isAccepted() && !child3);
+
+        delete root;
+    }
+}
+
+void tst_QTouchEvent::deleteInRawEventTranslation()
+{
+    tst_QTouchEventWidget touchWidget;
+    touchWidget.setAttribute(Qt::WA_AcceptTouchEvents);
+    touchWidget.setGeometry(100, 100, 300, 300);
+
+    tst_QTouchEventWidget *leftWidget = new tst_QTouchEventWidget;
+    leftWidget->setParent(&touchWidget);
+    leftWidget->setAttribute(Qt::WA_AcceptTouchEvents);
+    leftWidget->setGeometry(0, 100, 100, 100);
+    leftWidget->deleteInTouchBegin = true;
+    leftWidget->show();
+
+    tst_QTouchEventWidget *centerWidget = new tst_QTouchEventWidget;
+    centerWidget->setParent(&touchWidget);
+    centerWidget->setAttribute(Qt::WA_AcceptTouchEvents);
+    centerWidget->setGeometry(100, 100, 100, 100);
+    centerWidget->deleteInTouchUpdate = true;
+    centerWidget->show();
+
+    tst_QTouchEventWidget *rightWidget = new tst_QTouchEventWidget;
+    rightWidget->setParent(&touchWidget);
+    rightWidget->setAttribute(Qt::WA_AcceptTouchEvents);
+    rightWidget->setGeometry(200, 100, 100, 100);
+    rightWidget->deleteInTouchEnd = true;
+    rightWidget->show();
+
+    QPointF leftPos = leftWidget->rect().center();
+    QPointF centerPos = centerWidget->rect().center();
+    QPointF rightPos = rightWidget->rect().center();
+    QPointF leftScreenPos = leftWidget->mapToGlobal(leftPos.toPoint());
+    QPointF centerScreenPos = centerWidget->mapToGlobal(centerPos.toPoint());
+    QPointF rightScreenPos = rightWidget->mapToGlobal(rightPos.toPoint());
+    QRectF screenGeometry = qApp->desktop()->screenGeometry(&touchWidget);
+
+    QWeakPointer<QWidget> pl = leftWidget, pc = centerWidget, pr = rightWidget;
+
+    QList<QTouchEvent::TouchPoint> rawTouchPoints;
+    rawTouchPoints.append(QTouchEvent::TouchPoint(0));
+    rawTouchPoints.append(QTouchEvent::TouchPoint(1));
+    rawTouchPoints.append(QTouchEvent::TouchPoint(2));
+    rawTouchPoints[0].setState(Qt::TouchPointPressed);
+    rawTouchPoints[0].setScreenPos(leftScreenPos);
+    rawTouchPoints[0].setNormalizedPos(normalized(rawTouchPoints[0].pos(), screenGeometry));
+    rawTouchPoints[1].setState(Qt::TouchPointPressed);
+    rawTouchPoints[1].setScreenPos(centerScreenPos);
+    rawTouchPoints[1].setNormalizedPos(normalized(rawTouchPoints[1].pos(), screenGeometry));
+    rawTouchPoints[2].setState(Qt::TouchPointPressed);
+    rawTouchPoints[2].setScreenPos(rightScreenPos);
+    rawTouchPoints[2].setNormalizedPos(normalized(rawTouchPoints[2].pos(), screenGeometry));
+
+    // generate begin events on all widgets, the left widget should die
+    qt_translateRawTouchEvent(&touchWidget, QTouchEvent::TouchScreen, rawTouchPoints);
+    QVERIFY(pl.isNull() && !pc.isNull() && !pr.isNull());
+
+    // generate update events on all widget, the center widget should die
+    rawTouchPoints[0].setState(Qt::TouchPointMoved);
+    rawTouchPoints[1].setState(Qt::TouchPointMoved);
+    rawTouchPoints[2].setState(Qt::TouchPointMoved);
+    qt_translateRawTouchEvent(&touchWidget, QTouchEvent::TouchScreen, rawTouchPoints);
+
+    // generate end events on all widget, the right widget should die
+    rawTouchPoints[0].setState(Qt::TouchPointReleased);
+    rawTouchPoints[1].setState(Qt::TouchPointReleased);
+    rawTouchPoints[2].setState(Qt::TouchPointReleased);
+    qt_translateRawTouchEvent(&touchWidget, QTouchEvent::TouchScreen, rawTouchPoints);
+}
+
 QTEST_MAIN(tst_QTouchEvent)
 
 #include "tst_qtouchevent.moc"      
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 3d68a73..ae0131c 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -272,6 +272,8 @@ private slots:
     void numericalConvert();
     void moreCustomTypes();
     void variantInVariant();
+
+    void colorInteger();
 };
 
 Q_DECLARE_METATYPE(QDate)
@@ -3388,5 +3390,20 @@ void tst_QVariant::variantInVariant()
     QCOMPARE(qvariant_cast<QVariant>(var9), var1);
 }
 
+void tst_QVariant::colorInteger()
+{
+    QVariant v = QColor(Qt::red);
+    QCOMPARE(v.type(), QVariant::Color);
+    QCOMPARE(v.value<QColor>(), QColor(Qt::red));
+
+    v.setValue(1000);
+    QCOMPARE(v.type(), QVariant::Int);
+    QCOMPARE(v.toInt(), 1000);
+
+    v.setValue(QColor(Qt::yellow));
+    QCOMPARE(v.type(), QVariant::Color);
+    QCOMPARE(v.value<QColor>(), QColor(Qt::yellow));
+}
+
 QTEST_MAIN(tst_QVariant)
 #include "tst_qvariant.moc"
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 9960f47..3e14b56 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9549,6 +9549,22 @@ void tst_QWidget::setGraphicsEffect()
     delete widget;
     QVERIFY(!blurEffect);
     delete anotherWidget;
+
+    // Ensure the effect is uninstalled when deleting it
+    widget = new QWidget;
+    blurEffect = new QGraphicsBlurEffect;
+    widget->setGraphicsEffect(blurEffect);
+    delete blurEffect;
+    QVERIFY(!widget->graphicsEffect());
+
+    // Ensure the existing effect is uninstalled and deleted when setting a null effect
+    blurEffect = new QGraphicsBlurEffect;
+    widget->setGraphicsEffect(blurEffect);
+    widget->setGraphicsEffect(0);
+    QVERIFY(!widget->graphicsEffect());
+    QVERIFY(!blurEffect);
+
+    delete widget;
 }
 
 void tst_QWidget::activateWindow()