Merge remote-tracking branch 'origin/4.8' into HEAD

31 files changed, 1598 insertions, 294 deletions

diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 7a018e3..9273142 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -346,8 +346,12 @@ void PaintCommands::staticInit()
                       "gradient_setLinear 1.0 1.0 2.0 2.0");
     DECL_PAINTCOMMAND("gradient_setRadial", command_gradient_setRadial,
                       "^gradient_setRadial\\s+([\\w.]*)\\s+([\\w.]*)\\s+([\\w.]*)\\s?([\\w.]*)\\s?([\\w.]*)$",
-                      "gradient_setRadial <cx> <cy> <rad> <fx> <fy>\n  - C is the center\n  - rad is the angle in degrees\n  - F is the focal point",
+                      "gradient_setRadial <cx> <cy> <rad> <fx> <fy>\n  - C is the center\n  - rad is the radius\n  - F is the focal point",
                       "gradient_setRadial 1.0 1.0 45.0 2.0 2.0");
+    DECL_PAINTCOMMAND("gradient_setRadialExtended", command_gradient_setRadialExtended,
+                      "^gradient_setRadialExtended\\s+([\\w.]*)\\s+([\\w.]*)\\s+([\\w.]*)\\s?([\\w.]*)\\s?([\\w.]*)\\s?([\\w.]*)$",
+                      "gradient_setRadialExtended <cx> <cy> <rad> <fx> <fy> <frad>\n  - C is the center\n  - rad is the center radius\n  - F is the focal point\n  - frad is the focal radius",
+                      "gradient_setRadialExtended 1.0 1.0 45.0 2.0 2.0 45.0");
     DECL_PAINTCOMMAND("gradient_setLinearPen", command_gradient_setLinearPen,
                       "^gradient_setLinearPen\\s+([\\w.]*)\\s+([\\w.]*)\\s+([\\w.]*)\\s+([\\w.]*)$",
                       "gradient_setLinearPen <x1> <y1> <x2> <y2>",
@@ -2400,7 +2404,7 @@ void PaintCommands::command_gradient_setRadial(QRegExp re)
     double fy = convertToDouble(caps.at(5));
 
     if (m_verboseMode)
-        printf(" -(lance) gradient_setRadial center=(%.2f, %.2f), radius=%.2f focal=(%.2f, %.2f), "
+        printf(" -(lance) gradient_setRadial center=(%.2f, %.2f), radius=%.2f, focal=(%.2f, %.2f), "
                "spread=%d\n",
                cx, cy, rad, fx, fy, m_gradientSpread);
 
@@ -2415,6 +2419,32 @@ void PaintCommands::command_gradient_setRadial(QRegExp re)
 }
 
 /***************************************************************************************************/
+void PaintCommands::command_gradient_setRadialExtended(QRegExp re)
+{
+    QStringList caps = re.capturedTexts();
+    double cx = convertToDouble(caps.at(1));
+    double cy = convertToDouble(caps.at(2));
+    double rad = convertToDouble(caps.at(3));
+    double fx = convertToDouble(caps.at(4));
+    double fy = convertToDouble(caps.at(5));
+    double frad = convertToDouble(caps.at(6));
+
+    if (m_verboseMode)
+        printf(" -(lance) gradient_setRadialExtended center=(%.2f, %.2f), radius=%.2f, focal=(%.2f, %.2f), "
+               "focal radius=%.2f, spread=%d\n",
+               cx, cy, rad, fx, fy, frad, m_gradientSpread);
+
+    QRadialGradient rg(QPointF(cx, cy), rad, QPointF(fx, fy), frad);
+    rg.setStops(m_gradientStops);
+    rg.setSpread(m_gradientSpread);
+    rg.setCoordinateMode(m_gradientCoordinate);
+    QBrush brush(rg);
+    QTransform brush_matrix = m_painter->brush().transform();
+    brush.setTransform(brush_matrix);
+    m_painter->setBrush(brush);
+}
+
+/***************************************************************************************************/
 void PaintCommands::command_gradient_setConical(QRegExp re)
 {
     QStringList caps = re.capturedTexts();
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index 2740412..08c0e25 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -179,6 +179,7 @@ private:
     void command_gradient_setConical(QRegExp re);
     void command_gradient_setLinear(QRegExp re);
     void command_gradient_setRadial(QRegExp re);
+    void command_gradient_setRadialExtended(QRegExp re);
     void command_gradient_setLinearPen(QRegExp re);
     void command_gradient_setSpread(QRegExp re);
     void command_gradient_setCoordinateMode(QRegExp re);
diff --git a/tests/arthur/data/qps/radial_gradients_extended.qps b/tests/arthur/data/qps/radial_gradients_extended.qps
new file mode 100644
index 0000000..d80a149
--- /dev/null
+++ b/tests/arthur/data/qps/radial_gradients_extended.qps
@@ -0,0 +1,95 @@
+path_addRect path 400 0 80 80
+path_addEllipse path 440 40 60 60
+
+setRenderHint Antialiasing
+
+setPen black
+
+begin_block gradients
+gradient_clearStops
+gradient_appendStop 0    red
+gradient_appendStop 0.25 orange
+gradient_appendStop 0.5  yellow
+gradient_appendStop 0.8  green
+gradient_appendStop 1    cyan
+
+gradient_setSpread PadSpread
+gradient_setRadialExtended 0 0 20 40 40 10
+drawRect 0 0 100 100
+
+gradient_setSpread ReflectSpread
+gradient_setRadialExtended 120 20 20 140 40 10
+drawEllipse 100 0 100 100
+
+gradient_setSpread RepeatSpread
+gradient_setRadialExtended 240 20 20 260 40 10
+drawRoundRect 200 0 100 100
+
+gradient_clearStops
+gradient_appendStop 0   3f7f7fff
+gradient_appendStop 0.5 dfdfffff
+gradient_appendStop 1   7f00007f
+
+gradient_setSpread PadSpread
+gradient_setRadialExtended 320 20 20 340 40 10
+drawPolygon [300 0 390 0 350 99]
+
+gradient_setSpread ReflectSpread
+gradient_setRadialExtended 420 20 20 440 40 10
+drawPath path
+
+gradient_setSpread RepeatSpread
+gradient_setRadialExtended 520 20 20 540 40 10
+drawPie 500 0 100 100 720 4320
+end_block
+
+translate 0 100
+scale 1 2
+repeat_block gradients
+
+resetMatrix
+translate 0 300
+brushTranslate 30 0
+brushScale 0.9 0.9
+repeat_block gradients
+
+# Some helpful info perhaps?
+resetMatrix
+setPen black
+
+drawText 610 50 "No XForm"
+drawText 610 200 "scale 1x2"
+drawText 610 300 "brush transform"
+drawText 10 450 "Pad"
+drawText 110 450 "Reflect"
+drawText 210 450 "Repeat"
+drawText 310 450 "Pad w/alpha"
+drawText 410 450 "Reflect w/alpha"
+drawText 510 450 "Repeat w/alpha"
+
+# Radius and focal indicators
+setPen 3f000000
+setBrush nobrush
+
+begin_block ellipse_draw
+setClipRect 0 0 100 100
+drawEllipse -30 -30 100 100
+drawEllipse 35 35 11 11
+translate 100 0
+end_block
+
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+
+resetMatrix
+translate 0 100
+scale 1 2
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
+repeat_block ellipse_draw
diff --git a/tests/arthur/data/qps/radial_gradients_extended_qps.png b/tests/arthur/data/qps/radial_gradients_extended_qps.png
new file mode 100644
index 0000000..45a3e60
--- /dev/null
+++ b/tests/arthur/data/qps/radial_gradients_extended_qps.png
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 8000137..46c3519 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -458,6 +458,16 @@ void tst_QDeclarativePathView::dataModel()
     model.removeItem(model.count()-1);
     QCOMPARE(pathview->currentIndex(), model.count()-1);
 
+    // QTBUG-18825
+    // Confirm that the target offset is adjusted when removing items
+    pathview->setCurrentIndex(model.count()-1);
+    QTRY_COMPARE(pathview->offset(), 1.);
+    pathview->setCurrentIndex(model.count()-5);
+    model.removeItem(model.count()-1);
+    model.removeItem(model.count()-1);
+    model.removeItem(model.count()-1);
+    QTRY_COMPARE(pathview->offset(), 2.);
+
     delete canvas;
 }
 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false_readonly.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false_readonly.qml
new file mode 100644
index 0000000..4aea611
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false_readonly.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+TextEdit {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: false
+    readOnly: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true_readonly.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true_readonly.qml
new file mode 100644
index 0000000..959e683
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true_readonly.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+TextEdit {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    readOnly: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 26a6fd8..2fad88d 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -119,6 +119,10 @@ private slots:
     void moveCursorSelectionSequence();
     void mouseSelection_data();
     void mouseSelection();
+    void deferEnableSelectByMouse_data();
+    void deferEnableSelectByMouse();
+    void deferDisableSelectByMouse_data();
+    void deferDisableSelectByMouse();
     void mouseSelectionMode_data();
     void mouseSelectionMode();
     void dragMouseSelection();
@@ -1360,6 +1364,86 @@ void tst_qdeclarativetextedit::mouseSelection()
     delete canvas;
 }
 
+void tst_qdeclarativetextedit::deferEnableSelectByMouse_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+
+    QTest::newRow("writable") << SRCDIR "/data/mouseselection_false.qml";
+    QTest::newRow("read only") << SRCDIR "/data/mouseselection_false_readonly.qml";
+}
+
+void tst_qdeclarativetextedit::deferEnableSelectByMouse()
+{
+    // Verify text isn't selected if selectByMouse is enabled after the mouse button has been pressed.
+    QFETCH(QString, qmlfile);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textEditObject->height()/2;
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    textEditObject->setSelectByMouse(true);
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QVERIFY(textEditObject->selectedText().isEmpty());
+
+    delete canvas;
+}
+
+void tst_qdeclarativetextedit::deferDisableSelectByMouse_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+
+    QTest::newRow("writable") << SRCDIR "/data/mouseselection_true.qml";
+    QTest::newRow("read only") << SRCDIR "/data/mouseselection_true_readonly.qml";
+}
+
+void tst_qdeclarativetextedit::deferDisableSelectByMouse()
+{
+    // Verify text isn't selected if selectByMouse is enabled after the mouse button has been pressed.
+    QFETCH(QString, qmlfile);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textEditObject->height()/2;
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    textEditObject->setSelectByMouse(false);
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QVERIFY(textEditObject->selectedText().length() > 3);
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextedit::dragMouseSelection()
 {
     QString qmlfile = SRCDIR "/data/mouseselection_true.qml";
@@ -1546,6 +1630,15 @@ void tst_qdeclarativetextedit::cursorDelegate()
         QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
         QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
     }
+    const QString preedit = "preedit";
+    for (int i = 0; i <= preedit.length(); i++) {
+        QInputMethodEvent event(preedit, QList<QInputMethodEvent::Attribute>()
+                << QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, i, 1, QVariant()));
+        QApplication::sendEvent(view, &event);
+
+        QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
+        QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
+    }
     textEditObject->setCursorPosition(0);
     QCOMPARE(textEditObject->cursorRectangle().x(), qRound(delegateObject->x()));
     QCOMPARE(textEditObject->cursorRectangle().y(), qRound(delegateObject->y()));
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_default.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_default.qml
new file mode 100644
index 0000000..eea83ed
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_default.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: false
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false.qml
new file mode 100644
index 0000000..eea83ed
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: false
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_readonly.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_readonly.qml
new file mode 100644
index 0000000..36a9563
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_readonly.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: false
+    readOnly: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_words.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_words.qml
new file mode 100644
index 0000000..eea83ed
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_words.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: false
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_readonly.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_readonly.qml
new file mode 100644
index 0000000..678a89a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_readonly.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    readOnly: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_words.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_words.qml
new file mode 100644
index 0000000..8115ba0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_words.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index baaf862..a241241 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -95,6 +95,12 @@ private slots:
     void moveCursorSelection();
     void moveCursorSelectionSequence_data();
     void moveCursorSelectionSequence();
+    void mouseSelection_data();
+    void mouseSelection();
+    void deferEnableSelectByMouse_data();
+    void deferEnableSelectByMouse();
+    void deferDisableSelectByMouse_data();
+    void deferDisableSelectByMouse();
     void dragMouseSelection();
     void mouseSelectionMode_data();
     void mouseSelectionMode();
@@ -911,6 +917,141 @@ void tst_qdeclarativetextinput::moveCursorSelectionSequence()
     QCOMPARE(textinputObject->selectionEnd(), selection2End);
 }
 
+void tst_qdeclarativetextinput::mouseSelection_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+    QTest::addColumn<bool>("expectSelection");
+
+    // import installed
+    QTest::newRow("on") << SRCDIR "/data/mouseselection_true.qml" << true;
+    QTest::newRow("off") << SRCDIR "/data/mouseselection_false.qml" << false;
+    QTest::newRow("default") << SRCDIR "/data/mouseselection_default.qml" << false;
+    QTest::newRow("on word selection") << SRCDIR "/data/mouseselection_true_words.qml" << true;
+    QTest::newRow("off word selection") << SRCDIR "/data/mouseselection_false_words.qml" << false;
+    QTest::newRow("on read only") << SRCDIR "/data/mouseselection_true_readonly.qml" << true;
+    QTest::newRow("off read only") << SRCDIR "/data/mouseselection_false_readonly.qml" << false;
+}
+
+void tst_qdeclarativetextinput::mouseSelection()
+{
+    QFETCH(QString, qmlfile);
+    QFETCH(bool, expectSelection);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textInputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textInputObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textInputObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str = textInputObject->selectedText();
+    if (expectSelection)
+        QVERIFY(str.length() > 3); // don't reallly care *what* was selected (and it's too sensitive to platform)
+    else
+        QVERIFY(str.isEmpty());
+
+    // Clicking and shift to clicking between the same points should select the same text.
+    textInputObject->setCursorPosition(0);
+    QTest::mouseClick(canvas->viewport(), Qt::LeftButton, Qt::NoModifier, canvas->mapFromScene(QPoint(x1,y)));
+    QTest::mouseClick(canvas->viewport(), Qt::LeftButton, Qt::ShiftModifier, canvas->mapFromScene(QPoint(x2,y)));
+    QCOMPARE(textInputObject->selectedText(), str);
+
+    delete canvas;
+}
+
+void tst_qdeclarativetextinput::deferEnableSelectByMouse_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+
+    QTest::newRow("writable") << SRCDIR "/data/mouseselection_false.qml";
+    QTest::newRow("read only") << SRCDIR "/data/mouseselection_false_readonly.qml";
+}
+
+void tst_qdeclarativetextinput::deferEnableSelectByMouse()
+{
+    // Verify text isn't selected if selectByMouse is enabled after the mouse button has been pressed.
+    QFETCH(QString, qmlfile);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textInputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textInputObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textInputObject->height()/2;
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    textInputObject->setSelectByMouse(true);
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QVERIFY(textInputObject->selectedText().isEmpty());
+
+    delete canvas;
+}
+
+void tst_qdeclarativetextinput::deferDisableSelectByMouse_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+
+    QTest::newRow("writable") << SRCDIR "/data/mouseselection_true.qml";
+    QTest::newRow("read only") << SRCDIR "/data/mouseselection_true_readonly.qml";
+}
+
+void tst_qdeclarativetextinput::deferDisableSelectByMouse()
+{
+    // Verify text isn't selected if selectByMouse is enabled after the mouse button has been pressed.
+    QFETCH(QString, qmlfile);
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textInputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textInputObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textInputObject->height()/2;
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    textInputObject->setSelectByMouse(false);
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QVERIFY(textInputObject->selectedText().length() > 3);
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextinput::dragMouseSelection()
 {
     QString qmlfile = SRCDIR "/data/mouseselection_true.qml";
@@ -1643,6 +1784,15 @@ void tst_qdeclarativetextinput::cursorDelegate()
         QCOMPARE(textInputObject->cursorRectangle().x(), qRound(delegateObject->x()));
         QCOMPARE(textInputObject->cursorRectangle().y(), qRound(delegateObject->y()));
     }
+    const QString preedit = "preedit";
+    for (int i = 0; i <= preedit.length(); i++) {
+        QInputMethodEvent event(preedit, QList<QInputMethodEvent::Attribute>()
+                << QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, i, 1, QVariant()));
+        QApplication::sendEvent(view, &event);
+
+        QCOMPARE(textInputObject->cursorRectangle().x(), qRound(delegateObject->x()));
+        QCOMPARE(textInputObject->cursorRectangle().y(), qRound(delegateObject->y()));
+    }
     textInputObject->setCursorPosition(0);
     QCOMPARE(textInputObject->cursorRectangle().x(), qRound(delegateObject->x()));
     QCOMPARE(textInputObject->cursorRectangle().y(), qRound(delegateObject->y()));
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index 85d7876..7b384f8 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -190,6 +190,11 @@ void tst_qdeclarativevisualdatamodel::rootIndex()
     QMetaObject::invokeMethod(obj, "setRootToParent");
     QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
 
+    QMetaObject::invokeMethod(obj, "setRoot");
+    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
+    model.clear(); // will emit modelReset()
+    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
+
     delete obj;
 }
 
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 0d77fff..22c5e51 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -84,6 +84,7 @@ SUBDIRS=\
     qheaderview \
     qicoimageformat \
     qicon \
+    qidentityproxymodel \
     qimageiohandler \
     qimagereader \
     qimagewriter \
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp
index b5c65ef..b6135d0 100644
--- a/tests/auto/headers/tst_headers.cpp
+++ b/tests/auto/headers/tst_headers.cpp
@@ -243,6 +243,10 @@ void tst_Headers::licenseCheck()
         QCOMPARE(content.at(i++), QString("**"));
         if (sourceFile.endsWith("/tests/auto/modeltest/dynamictreemodel.cpp")
             || sourceFile.endsWith("/tests/auto/modeltest/dynamictreemodel.h")
+            || sourceFile.endsWith("/src/gui/itemviews/qidentityproxymodel.h")
+            || sourceFile.endsWith("/src/gui/itemviews/qidentityproxymodel.cpp")
+            || sourceFile.endsWith("/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp")
+            || sourceFile.endsWith("/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp")
             || sourceFile.endsWith("/src/network/kernel/qnetworkproxy_p.h"))
         {
             // These files are not copyrighted by Nokia.
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 8d9603b..7ff1a08 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -245,10 +245,13 @@ private slots:
     void actionText();
     void doAction();
 
+    void applicationTest();
+    void mainWindowTest();
     void buttonTest();
     void sliderTest();
     void scrollBarTest();
     void tabTest();
+    void tabWidgetTest();
     void menuTest();
     void spinBoxTest();
     void doubleSpinBoxTest();
@@ -479,6 +482,11 @@ void tst_QAccessibility::eventTest()
     QVERIFY_EVENT(button, 0, QAccessible::StateChanged);
     QVERIFY_EVENT(button, 0, QAccessible::StateChanged);
 
+    button->setAccessibleName("Olaf the second");
+    QVERIFY_EVENT(button, 0, QAccessible::NameChanged);
+    button->setAccessibleDescription("This is a button labeled Olaf");
+    QVERIFY_EVENT(button, 0, QAccessible::DescriptionChanged);
+
     button->hide();
     QVERIFY_EVENT(button, 0, QAccessible::ObjectHide);
 
@@ -1821,49 +1829,100 @@ void tst_QAccessibility::doAction()
 #endif
 }
 
+void tst_QAccessibility::applicationTest()
+{
+#ifdef QTEST_ACCESSIBILITY
+    QLatin1String name = QLatin1String("My Name");
+    qApp->setApplicationName(name);
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(qApp);
+    QCOMPARE(interface->text(QAccessible::Name, 0), name);
+    QCOMPARE(interface->role(0), QAccessible::Application);
+    delete interface;
+#else
+    QSKIP("Test needs accessibility support.", SkipAll);
+#endif
+}
+
+void tst_QAccessibility::mainWindowTest()
+{
+#ifdef QTEST_ACCESSIBILITY
+    QMainWindow mw;
+    mw.resize(300, 200);
+    mw.show(); // triggers layout
+
+    QLatin1String name = QLatin1String("I am the main window");
+    mw.setWindowTitle(name);
+    QTest::qWaitForWindowShown(&mw);
+
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&mw);
+    QCOMPARE(interface->text(QAccessible::Name, 0), name);
+    QCOMPARE(interface->role(0), QAccessible::Window);
+    delete interface;
+
+#else
+    QSKIP("Test needs accessibility support.", SkipAll);
+#endif
+}
+
+class CounterButton : public QPushButton {
+    Q_OBJECT
+public:
+    CounterButton(const QString& name, QWidget* parent)
+        : QPushButton(name, parent), clickCount(0)
+    {
+        connect(this, SIGNAL(clicked(bool)), SLOT(incClickCount()));
+    }
+    int clickCount;
+public Q_SLOTS:
+    void incClickCount() {
+        ++clickCount;
+    }
+};
+
 void tst_QAccessibility::buttonTest()
 {
-//#ifdef QTEST_ACCESSIBILITY
-#if 0
-    QAccessibleInterface *test = 0;
-    Q3VBox vbox;
+#ifdef QTEST_ACCESSIBILITY
+    QWidget window;
+    window.setLayout(new QVBoxLayout);
 
     // Standard push button
-    QPushButton pushButton("Ok", &vbox);
+    CounterButton pushButton("Ok", &window);
 
-    // toggle push button
-    QPushButton togglepush("Toggle", &vbox);
-    togglepush.setToggleButton(TRUE);
-
-    // push button with a menu
-    QPushButton menuButton("Menu", &vbox);
-    Q3PopupMenu buttonMenu(&menuButton);
-    buttonMenu.insertItem("Some item");
-    menuButton.setPopup(&buttonMenu);
+    // toggle button
+    QPushButton toggleButton("Toggle", &window);
+    toggleButton.setCheckable(true);
 
     // standard checkbox
-    QCheckBox checkBox("Check me!", &vbox);
+    QCheckBox checkBox("Check me!", &window);
 
     // tristate checkbox
-    QCheckBox tristate("Tristate!", &vbox);
+    QCheckBox tristate("Tristate!", &window);
     tristate.setTristate(TRUE);
 
     // radiobutton
-    QRadioButton radio("Radio me!", &vbox);
+    QRadioButton radio("Radio me!", &window);
 
     // standard toolbutton
-    QToolButton toolbutton(&vbox);
+    QToolButton toolbutton(&window);
     toolbutton.setText("Tool");
     toolbutton.setMinimumSize(20,20);
 
     // standard toolbutton
-    QToolButton toggletool(&vbox);
-    toggletool.setToggleButton(TRUE);
+    QToolButton toggletool(&window);
+    toggletool.setCheckable(true);
     toggletool.setText("Toggle");
     toggletool.setMinimumSize(20,20);
 
+#if 0
+    // QT3_SUPPORT
+    // push button with a menu
+    QPushButton menuButton("Menu", &window);
+    Q3PopupMenu buttonMenu(&menuButton);
+    buttonMenu.insertItem("Some item");
+    menuButton.setPopup(&buttonMenu);
+
     // menu toolbutton
-    QToolButton menuToolButton(&vbox);
+    QToolButton menuToolButton(&window);
     menuToolButton.setText("Menu Tool");
     Q3PopupMenu toolMenu(&menuToolButton);
     toolMenu.insertItem("Some item");
@@ -1871,141 +1930,149 @@ void tst_QAccessibility::buttonTest()
     menuToolButton.setMinimumSize(20,20);
 
     // splitted menu toolbutton
-    QToolButton splitToolButton(&vbox);
+    QToolButton splitToolButton(&window);
     splitToolButton.setTextLabel("Split Tool");
     Q3PopupMenu splitMenu(&splitToolButton);
     splitMenu.insertItem("Some item");
     splitToolButton.setPopup(&splitMenu);
     splitToolButton.setPopupDelay(0);
     splitToolButton.setMinimumSize(20,20);
+#endif
 
     // test push button
-    QVERIFY(QAccessible::queryAccessibleInterface(&pushButton, &test));
-    QCOMPARE(test->role(0), QAccessible::PushButton);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Press"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    pushButton.setDown(TRUE);
-    QCOMPARE(test->state(0), (int)QAccessible::Pressed);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
+    QAccessibleInterface* interface = QAccessible::queryAccessibleInterface(&pushButton);
+    QAccessibleActionInterface* actionInterface = interface->actionInterface();
+    QVERIFY(actionInterface != 0);
+
+    QCOMPARE(interface->role(0), QAccessible::PushButton);
+
+    // currently our buttons only have click as action, press and release are missing
+    QCOMPARE(actionInterface->actionCount(), 1);
+    QCOMPARE(actionInterface->name(0), QString("Press"));
+    QCOMPARE(pushButton.clickCount, 0);
+    actionInterface->doAction(0);
     QTest::qWait(500);
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    test->release();
-
-    // test toggle push button
-    QVERIFY(QAccessible::queryAccessibleInterface(&togglepush, &test));
-    QCOMPARE(test->role(0), QAccessible::CheckBox);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
+    QCOMPARE(pushButton.clickCount, 1);
+    delete interface;
+
+    // test toggle button
+    interface = QAccessible::queryAccessibleInterface(&toggleButton);
+    actionInterface = interface->actionInterface();
+    QCOMPARE(interface->role(0), QAccessible::CheckBox);
+    QCOMPARE(actionInterface->description(0), QString("Toggles the button."));
+    QCOMPARE(actionInterface->name(0), QString("Check"));
+    QVERIFY(!toggleButton.isChecked());
+    QVERIFY((interface->state(0) & QAccessible::Checked) == 0);
+    actionInterface->doAction(0);
     QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
-    QCOMPARE(test->state(0), (int)QAccessible::Checked);
-    test->release();
-
-    // test menu push button
-    QVERIFY(QAccessible::queryAccessibleInterface(&menuButton, &test));
-    QCOMPARE(test->role(0), QAccessible::ButtonMenu);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Open"));
-    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
-    test->release();
+    QCOMPARE(actionInterface->name(0), QString("Uncheck"));
+    QVERIFY(toggleButton.isChecked());
+    QVERIFY((interface->state(0) & QAccessible::Checked));
+    delete interface;
+
+//    // test menu push button
+//    QVERIFY(QAccessible::queryAccessibleInterface(&menuButton, &test));
+//    QCOMPARE(test->role(0), QAccessible::ButtonMenu);
+//    QCOMPARE(test->defaultAction(0), QAccessible::Press);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Open"));
+//    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
+//    test->release();
 
     // test check box
-    QVERIFY(QAccessible::queryAccessibleInterface(&checkBox, &test));
-    QCOMPARE(test->role(0), QAccessible::CheckBox);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
+    interface = QAccessible::queryAccessibleInterface(&checkBox);
+    actionInterface = interface->actionInterface();
+    QCOMPARE(interface->role(0), QAccessible::CheckBox);
+    QCOMPARE(actionInterface->name(0), QString("Check"));
+    QVERIFY((interface->state(0) & QAccessible::Checked) == 0);
+    actionInterface->doAction(0);
     QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
-    QCOMPARE(test->state(0), (int)QAccessible::Checked);
-    test->release();
-
-    // test tristate check box
-    QVERIFY(QAccessible::queryAccessibleInterface(&tristate, &test));
-    QCOMPARE(test->role(0), QAccessible::CheckBox);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Toggle"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
-    QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Mixed);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
-    QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
-    QCOMPARE(test->state(0), (int)QAccessible::Checked);
-    test->release();
+    QCOMPARE(actionInterface->name(0), QString("Uncheck"));
+    QVERIFY(interface->state(0) & QAccessible::Checked);
+    QVERIFY(checkBox.isChecked());
+    delete interface;
+
+//    // test tristate check box
+//    QVERIFY(QAccessible::queryAccessibleInterface(&tristate, &test));
+//    QCOMPARE(test->role(0), QAccessible::CheckBox);
+//    QCOMPARE(test->defaultAction(0), QAccessible::Press);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Toggle"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Normal);
+//    QVERIFY(test->doAction(QAccessible::Press, 0));
+//    QTest::qWait(500);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Mixed);
+//    QVERIFY(test->doAction(QAccessible::Press, 0));
+//    QTest::qWait(500);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Checked);
+//    test->release();
 
     // test radiobutton
-    QVERIFY(QAccessible::queryAccessibleInterface(&radio, &test));
-    QCOMPARE(test->role(0), QAccessible::RadioButton);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
-    QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Checked);
-    test->release();
-
-    // test standard toolbutton
-    QVERIFY(QAccessible::queryAccessibleInterface(&toolbutton, &test));
-    QCOMPARE(test->role(0), QAccessible::PushButton);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Press"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    test->release();
-
-    // toggle tool button
-    QVERIFY(QAccessible::queryAccessibleInterface(&toggletool, &test));
-    QCOMPARE(test->role(0), QAccessible::CheckBox);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
-    QCOMPARE(test->state(0), (int)QAccessible::Normal);
-    QVERIFY(test->doAction(QAccessible::Press, 0));
+    interface = QAccessible::queryAccessibleInterface(&radio);
+    actionInterface = interface->actionInterface();
+    QCOMPARE(interface->role(0), QAccessible::RadioButton);
+    QCOMPARE(actionInterface->name(0), QString("Check"));
+    QVERIFY((interface->state(0) & QAccessible::Checked) == 0);
+    actionInterface->doAction(0);
     QTest::qWait(500);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
-    QCOMPARE(test->state(0), (int)QAccessible::Checked);
-    test->release();
-
-    // test menu toolbutton
-    QVERIFY(QAccessible::queryAccessibleInterface(&menuToolButton, &test));
-    QCOMPARE(test->role(0), QAccessible::ButtonMenu);
-    QCOMPARE(test->defaultAction(0), 1);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Open"));
-    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
-    QCOMPARE(test->actionCount(0), 1);
-    QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 0), QString("Press"));
-    test->release();
-
-    // test splitted menu toolbutton
-    QVERIFY(QAccessible::queryAccessibleInterface(&splitToolButton, &test));
-    QCOMPARE(test->childCount(), 2);
-    QCOMPARE(test->role(0), QAccessible::ButtonDropDown);
-    QCOMPARE(test->role(1), QAccessible::PushButton);
-    QCOMPARE(test->role(2), QAccessible::ButtonMenu);
-    QCOMPARE(test->defaultAction(0), QAccessible::Press);
-    QCOMPARE(test->defaultAction(1), QAccessible::Press);
-    QCOMPARE(test->defaultAction(2), QAccessible::Press);
-    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Press"));
-    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
-    QCOMPARE(test->actionCount(0), 1);
-    QCOMPARE(test->actionText(1, QAccessible::Name, 0), QString("Open"));
-    QCOMPARE(test->actionText(test->defaultAction(1), QAccessible::Name, 1), QString("Press"));
-    QCOMPARE(test->state(1), (int)QAccessible::Normal);
-    QCOMPARE(test->actionText(test->defaultAction(2), QAccessible::Name, 2), QString("Open"));
-    QCOMPARE(test->state(2), (int)QAccessible::HasPopup);
-    test->release();
+    QCOMPARE(actionInterface->name(0), QString("Uncheck"));
+    QVERIFY(interface->state(0) & QAccessible::Checked);
+    QVERIFY(checkBox.isChecked());
+    delete interface;
+
+//    // test standard toolbutton
+//    QVERIFY(QAccessible::queryAccessibleInterface(&toolbutton, &test));
+//    QCOMPARE(test->role(0), QAccessible::PushButton);
+//    QCOMPARE(test->defaultAction(0), QAccessible::Press);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Press"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Normal);
+//    test->release();
+
+//    // toggle tool button
+//    QVERIFY(QAccessible::queryAccessibleInterface(&toggletool, &test));
+//    QCOMPARE(test->role(0), QAccessible::CheckBox);
+//    QCOMPARE(test->defaultAction(0), QAccessible::Press);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Check"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Normal);
+//    QVERIFY(test->doAction(QAccessible::Press, 0));
+//    QTest::qWait(500);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Uncheck"));
+//    QCOMPARE(test->state(0), (int)QAccessible::Checked);
+//    test->release();
+
+//    // test menu toolbutton
+//    QVERIFY(QAccessible::queryAccessibleInterface(&menuToolButton, &test));
+//    QCOMPARE(test->role(0), QAccessible::ButtonMenu);
+//    QCOMPARE(test->defaultAction(0), 1);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Open"));
+//    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
+//    QCOMPARE(test->actionCount(0), 1);
+//    QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 0), QString("Press"));
+//    test->release();
+
+//    // test splitted menu toolbutton
+//    QVERIFY(QAccessible::queryAccessibleInterface(&splitToolButton, &test));
+//    QCOMPARE(test->childCount(), 2);
+//    QCOMPARE(test->role(0), QAccessible::ButtonDropDown);
+//    QCOMPARE(test->role(1), QAccessible::PushButton);
+//    QCOMPARE(test->role(2), QAccessible::ButtonMenu);
+//    QCOMPARE(test->defaultAction(0), QAccessible::Press);
+//    QCOMPARE(test->defaultAction(1), QAccessible::Press);
+//    QCOMPARE(test->defaultAction(2), QAccessible::Press);
+//    QCOMPARE(test->actionText(test->defaultAction(0), QAccessible::Name, 0), QString("Press"));
+//    QCOMPARE(test->state(0), (int)QAccessible::HasPopup);
+//    QCOMPARE(test->actionCount(0), 1);
+//    QCOMPARE(test->actionText(1, QAccessible::Name, 0), QString("Open"));
+//    QCOMPARE(test->actionText(test->defaultAction(1), QAccessible::Name, 1), QString("Press"));
+//    QCOMPARE(test->state(1), (int)QAccessible::Normal);
+//    QCOMPARE(test->actionText(test->defaultAction(2), QAccessible::Name, 2), QString("Open"));
+//    QCOMPARE(test->state(2), (int)QAccessible::HasPopup);
+//    test->release();
 
     QTestAccessibility::clearEvents();
 
 #else
-//    QSKIP("Test needs accessibility support.", SkipAll);
-    QSKIP("No action interface in Qt 4 yet.", SkipAll);
+    QSKIP("Test needs accessibility support.", SkipAll);
 #endif
 }
 
@@ -2350,6 +2417,99 @@ void tst_QAccessibility::tabTest()
 #endif
 }
 
+void tst_QAccessibility::tabWidgetTest()
+{
+#ifdef QTEST_ACCESSIBILITY
+    QTabWidget *tabWidget = new QTabWidget();
+    tabWidget->show();
+
+    // the interface for the tab is just a container for tabbar and stacked widget
+    QAccessibleInterface * const interface = QAccessible::queryAccessibleInterface(tabWidget);
+    QVERIFY(interface);
+    QCOMPARE(interface->childCount(), 2);
+    QCOMPARE(interface->role(0), QAccessible::Client);
+
+    // Create pages, check navigation
+    QLabel *label1 = new QLabel("Page 1", tabWidget);
+    tabWidget->addTab(label1, "Tab 1");
+    QLabel *label2 = new QLabel("Page 2", tabWidget);
+    tabWidget->addTab(label2, "Tab 2");
+
+    QCOMPARE(interface->childCount(), 2);
+
+    QAccessibleInterface* tabBarInterface = 0;
+    // there is no special logic to sort the children, so the contents will be 1, the tab bar 2
+    QCOMPARE(interface->navigate(QAccessible::Child, 2 , &tabBarInterface), 0);
+    QVERIFY(tabBarInterface);
+    QCOMPARE(tabBarInterface->childCount(), 4);
+    QCOMPARE(tabBarInterface->role(0), QAccessible::PageTabList);
+
+    QAccessibleInterface* tabButton1Interface = 0;
+    QCOMPARE(tabBarInterface->navigate(QAccessible::Child, 1 , &tabButton1Interface), 1);
+    QVERIFY(tabButton1Interface == 0);
+
+    QCOMPARE(tabBarInterface->role(1), QAccessible::PageTab);
+    QCOMPARE(tabBarInterface->text(QAccessible::Name, 1), QLatin1String("Tab 1"));
+    QCOMPARE(tabBarInterface->role(2), QAccessible::PageTab);
+    QCOMPARE(tabBarInterface->text(QAccessible::Name, 2), QLatin1String("Tab 2"));
+    QCOMPARE(tabBarInterface->role(3), QAccessible::PushButton);
+    QCOMPARE(tabBarInterface->text(QAccessible::Name, 3), QLatin1String("Scroll Left"));
+    QCOMPARE(tabBarInterface->role(4), QAccessible::PushButton);
+    QCOMPARE(tabBarInterface->text(QAccessible::Name, 4), QLatin1String("Scroll Right"));
+
+    QAccessibleInterface* stackWidgetInterface = 0;
+    QCOMPARE(interface->navigate(QAccessible::Child, 1, &stackWidgetInterface), 0);
+    QVERIFY(stackWidgetInterface);
+    QCOMPARE(stackWidgetInterface->childCount(), 2);
+    QCOMPARE(stackWidgetInterface->role(0), QAccessible::LayeredPane);
+
+    QAccessibleInterface* stackChild1Interface = 0;
+    QCOMPARE(stackWidgetInterface->navigate(QAccessible::Child, 1, &stackChild1Interface), 0);
+    QVERIFY(stackChild1Interface);
+#ifndef Q_CC_INTEL
+    QCOMPARE(stackChild1Interface->childCount(), 0);
+#endif
+    QCOMPARE(stackChild1Interface->role(0), QAccessible::StaticText);
+    QCOMPARE(stackChild1Interface->text(QAccessible::Name, 0), QLatin1String("Page 1"));
+    QCOMPARE(label1, stackChild1Interface->object());
+
+    // Navigation in stack widgets should be consistent
+    QAccessibleInterface* parent = 0;
+    QCOMPARE(stackChild1Interface->navigate(QAccessible::Ancestor, 1, &parent), 0);
+    QVERIFY(parent);
+#ifndef Q_CC_INTEL
+    QCOMPARE(parent->childCount(), 2);
+#endif
+    QCOMPARE(parent->role(0), QAccessible::LayeredPane);
+    delete parent;
+
+    QAccessibleInterface* stackChild2Interface = 0;
+    QCOMPARE(stackWidgetInterface->navigate(QAccessible::Child, 2, &stackChild2Interface), 0);
+    QVERIFY(stackChild2Interface);
+    QCOMPARE(stackChild2Interface->childCount(), 0);
+    QCOMPARE(stackChild2Interface->role(0), QAccessible::StaticText);
+    QCOMPARE(label2, stackChild2Interface->object()); // the text will be empty since it is not visible
+
+    QCOMPARE(stackChild2Interface->navigate(QAccessible::Ancestor, 1, &parent), 0);
+    QVERIFY(parent);
+#ifndef Q_CC_INTEL
+    QCOMPARE(parent->childCount(), 2);
+#endif
+    QCOMPARE(parent->role(0), QAccessible::LayeredPane);
+    delete parent;
+
+    delete tabBarInterface;
+    delete stackChild1Interface;
+    delete stackChild2Interface;
+    delete stackWidgetInterface;
+    delete interface;
+    delete tabWidget;
+    QTestAccessibility::clearEvents();
+#else
+    QSKIP("Test needs accessibility support.", SkipAll);
+#endif
+}
+
 void tst_QAccessibility::menuTest()
 {
 #ifdef QTEST_ACCESSIBILITY
@@ -2679,6 +2839,11 @@ void tst_QAccessibility::textEditTest()
     QCOMPARE(iface->text(QAccessible::Value, 4), QString("hello world"));
     QCOMPARE(iface->text(QAccessible::Value, 5), QString("how are you today?"));
     QCOMPARE(iface->text(QAccessible::Value, 6), QString());
+    QCOMPARE(iface->textInterface()->characterCount(), 31);
+    QFontMetrics fm(edit.font());
+    QCOMPARE(iface->textInterface()->characterRect(0, QAccessible2::RelativeToParent).size(), QSize(fm.width("h"), fm.height()));
+    QCOMPARE(iface->textInterface()->characterRect(5, QAccessible2::RelativeToParent).size(), QSize(fm.width(" "), fm.height()));
+    QCOMPARE(iface->textInterface()->characterRect(6, QAccessible2::RelativeToParent).size(), QSize(fm.width("w"), fm.height()));
     }
     QTestAccessibility::clearEvents();
 #else
@@ -3883,10 +4048,10 @@ void tst_QAccessibility::pushButtonTest()
     QAccessibleInterface *acc;
     QAccessibleInterface *acc2;
     int entry = accToplevel->childAt(pt.x(), pt.y());
-    int child = accToplevel->navigate(QAccessible::Child, entry, &acc);
+    accToplevel->navigate(QAccessible::Child, entry, &acc);
     if (acc) {
         entry = acc->childAt(pt.x(), pt.y());
-        child = acc->navigate(QAccessible::Child, entry, &acc2);
+        acc->navigate(QAccessible::Child, entry, &acc2);
         delete acc;
         acc = acc2;
     }
diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/qcomplextext/tst_qcomplextext.cpp
index 3d8e290..58b31b4 100644
--- a/tests/auto/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/qcomplextext/tst_qcomplextext.cpp
@@ -71,6 +71,10 @@ private slots:
     void bidiReorderString();
     void bidiCursor_qtbug2795();
     void bidiCursor_PDF();
+    void bidiCursorMovement_data();
+    void bidiCursorMovement();
+    void bidiCursorLogicalMovement_data();
+    void bidiCursorLogicalMovement();
 };
 
 tst_QComplexText::tst_QComplexText()
@@ -185,6 +189,90 @@ void tst_QComplexText::bidiCursor_qtbug2795()
     QVERIFY(x1 == x2);
 }
 
+void tst_QComplexText::bidiCursorMovement_data()
+{
+    QTest::addColumn<QString>("logical");
+    QTest::addColumn<int>("basicDir");
+
+    const LV *data = logical_visual;
+    while ( data->name ) {
+        //next we fill it with data
+        QTest::newRow( data->name )
+            << QString::fromUtf8( data->logical )
+            << (int) data->basicDir;
+        data++;
+    }
+}
+
+void tst_QComplexText::bidiCursorMovement()
+{
+    QFETCH(QString, logical);
+    QFETCH(int,  basicDir);
+
+    QTextLayout layout(logical);
+
+    QTextOption option = layout.textOption();
+    option.setTextDirection(basicDir == QChar::DirL ? Qt::LeftToRight : Qt::RightToLeft);
+    layout.setTextOption(option);
+    layout.setCursorMoveStyle(QTextCursor::Visual);
+    bool moved;
+    int oldPos, newPos = 0;
+    qreal x, newX;
+
+    layout.beginLayout();
+    QTextLine line = layout.createLine();
+    layout.endLayout();
+
+    newX = line.cursorToX(0);
+    do {
+        oldPos = newPos;
+        x = newX;
+        newX = line.cursorToX(oldPos);
+        if (basicDir == QChar::DirL) {
+            QVERIFY(newX >= x);
+            newPos = layout.rightCursorPosition(oldPos);
+        } else
+        {
+            QVERIFY(newX <= x);
+            newPos = layout.leftCursorPosition(oldPos);
+        }
+        moved = (oldPos != newPos);
+    } while (moved);
+}
+
+void tst_QComplexText::bidiCursorLogicalMovement_data()
+{
+    bidiCursorMovement_data();
+}
+
+void tst_QComplexText::bidiCursorLogicalMovement()
+{
+    QFETCH(QString, logical);
+    QFETCH(int,  basicDir);
+
+    QTextLayout layout(logical);
+
+    QTextOption option = layout.textOption();
+    option.setTextDirection(basicDir == QChar::DirL ? Qt::LeftToRight : Qt::RightToLeft);
+    layout.setTextOption(option);
+    bool moved;
+    int oldPos, newPos = 0;
+
+    do {
+        oldPos = newPos;
+        newPos = layout.nextCursorPosition(oldPos);
+        QVERIFY(newPos >= oldPos);
+        moved = (oldPos != newPos);
+    } while (moved);
+
+    do {
+        oldPos = newPos;
+        newPos = layout.previousCursorPosition(oldPos);
+        QVERIFY(newPos <= oldPos);
+        moved = (oldPos != newPos);
+    } while (moved);
+}
+
 void tst_QComplexText::bidiCursor_PDF()
 {
     QString str = QString::fromUtf8("\342\200\252hello\342\200\254");
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 53781c9..e8d0f57 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -632,7 +632,12 @@ void tst_QFileSystemModel::filters_data()
     QTest::addColumn<int>("rowCount");
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
     QTest::newRow("no dirs") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs) << QStringList() << 2;
-    QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotanddotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 0;
+    QTest::newRow("one dir - dot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotanddotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
     QTest::newRow("one dir") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs) << QStringList() << 3;
     QTest::newRow("no dir + hidden") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::Hidden) << QStringList() << 2;
     QTest::newRow("dir+hid+files") << (QStringList() << "a" << "b" << "c") << QStringList() <<
@@ -650,7 +655,12 @@ void tst_QFileSystemModel::filters_data()
 #else
     QTest::qWait(3000); // We need to calm down a bit...
     QTest::newRow("no dirs") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs) << QStringList() << 0;
-    QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 1;
+    QTest::newRow("no dirs - dotanddotdot") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 0;
+    QTest::newRow("one dir - dot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotDot) << QStringList() << 2;
+    QTest::newRow("one dir - dotanddotdot") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs | QDir::NoDotAndDotDot) << QStringList() << 1;
     QTest::newRow("one dir") << (QStringList() << "a" << "b" << "c") << (QStringList() << "Z") << (int)(QDir::Dirs) << QStringList() << 1;
     QTest::newRow("no dir + hidden") << (QStringList() << "a" << "b" << "c") << QStringList() << (int)(QDir::Dirs | QDir::Hidden) << QStringList() << 0;
     QTest::newRow("dir+hid+files") << (QStringList() << "a" << "b" << "c") << QStringList() <<
@@ -699,10 +709,23 @@ void tst_QFileSystemModel::filters()
     // Make sure that we do what QDir does
     QDir xFactor(tmp);
     QDir::Filters  filters = (QDir::Filters)dirFilters;
+    QStringList dirEntries;
+
     if (nameFilters.count() > 0)
-        QCOMPARE(xFactor.entryList(nameFilters, filters).count(), rowCount);
+        dirEntries = xFactor.entryList(nameFilters, filters);
     else
-        QVERIFY(xFactor.entryList(filters).count() == rowCount);
+        dirEntries = xFactor.entryList(filters);
+
+    QCOMPARE(dirEntries.count(), rowCount);
+
+    QStringList modelEntries;
+
+    for (int i = 0; i < rowCount; ++i)
+        modelEntries.append(model->data(model->index(i, 0, root), QFileSystemModel::FileNameRole).toString());
+
+    qSort(dirEntries);
+    qSort(modelEntries);
+    QCOMPARE(dirEntries, modelEntries);
 
 #ifdef Q_OS_LINUX
     if (files.count() >= 3 && rowCount >= 3 && rowCount != 5) {
diff --git a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
new file mode 100644
index 0000000..f529e20
--- /dev/null
+++ b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+
+INCLUDEPATH += $$PWD/../modeltest
+
+SOURCES         += tst_qidentityproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
+HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
diff --git a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
new file mode 100644
index 0000000..cfc3f1a
--- /dev/null
+++ b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -0,0 +1,334 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the 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/QtTest>
+#include "../../shared/util.h"
+
+#include <QtCore>
+#include <QtGui>
+
+#include "dynamictreemodel.h"
+#include "qidentityproxymodel.h"
+
+//TESTED CLASS=
+//TESTED_FILES=
+
+Q_DECLARE_METATYPE(QModelIndex)
+
+class tst_QIdentityProxyModel : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    tst_QIdentityProxyModel();
+    virtual ~tst_QIdentityProxyModel();
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+private slots:
+    void insertRows();
+    void removeRows();
+    void moveRows();
+    void reset();
+
+protected:
+    void verifyIdentity(QAbstractItemModel *model, const QModelIndex &parent = QModelIndex());
+
+private:
+    QStandardItemModel *m_model;
+    QIdentityProxyModel *m_proxy;
+};
+
+tst_QIdentityProxyModel::tst_QIdentityProxyModel()
+    : m_model(0), m_proxy(0)
+{
+
+}
+
+tst_QIdentityProxyModel::~tst_QIdentityProxyModel()
+{
+
+}
+
+void tst_QIdentityProxyModel::initTestCase()
+{
+    qRegisterMetaType<QModelIndex>("QModelIndex");
+
+    m_model = new QStandardItemModel(0, 1);
+    m_proxy = new QIdentityProxyModel();
+}
+
+void tst_QIdentityProxyModel::cleanupTestCase()
+{
+    delete m_proxy;
+    delete m_model;
+}
+
+void tst_QIdentityProxyModel::init()
+{
+}
+
+void tst_QIdentityProxyModel::cleanup()
+{
+    m_model->clear();
+    m_model->insertColumns(0, 1);
+}
+
+void tst_QIdentityProxyModel::verifyIdentity(QAbstractItemModel *model, const QModelIndex &parent)
+{
+    const int rows = model->rowCount(parent);
+    const int columns = model->columnCount(parent);
+    const QModelIndex proxyParent = m_proxy->mapFromSource(parent);
+
+    QVERIFY(m_proxy->mapToSource(proxyParent) == parent);
+    QVERIFY(rows == m_proxy->rowCount(proxyParent));
+    QVERIFY(columns == m_proxy->columnCount(proxyParent));
+
+    for (int row = 0; row < rows; ++row) {
+        for (int column = 0; column < columns; ++column) {
+            const QModelIndex idx = model->index(row, column, parent);
+            const QModelIndex proxyIdx = m_proxy->mapFromSource(idx);
+            QVERIFY(proxyIdx.model() == m_proxy);
+            QVERIFY(m_proxy->mapToSource(proxyIdx) == idx);
+            QVERIFY(proxyIdx.isValid());
+            QVERIFY(proxyIdx.row() == row);
+            QVERIFY(proxyIdx.column() == column);
+            QVERIFY(proxyIdx.parent() == proxyParent);
+            QVERIFY(proxyIdx.data() == idx.data());
+            QVERIFY(proxyIdx.flags() == idx.flags());
+            const int childCount = m_proxy->rowCount(proxyIdx);
+            const bool hasChildren = m_proxy->hasChildren(proxyIdx);
+            QVERIFY(model->hasChildren(idx) == hasChildren);
+            QVERIFY((childCount > 0) == hasChildren);
+
+            if (hasChildren)
+                verifyIdentity(model, idx);
+        }
+    }
+}
+
+/*
+  tests
+*/
+
+void tst_QIdentityProxyModel::insertRows()
+{
+    QStandardItem *parentItem = m_model->invisibleRootItem();
+    for (int i = 0; i < 4; ++i) {
+        QStandardItem *item = new QStandardItem(QString("item %0").arg(i));
+        parentItem->appendRow(item);
+        parentItem = item;
+    }
+
+    m_proxy->setSourceModel(m_model);
+
+    verifyIdentity(m_model);
+
+    QSignalSpy modelBeforeSpy(m_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
+    QSignalSpy modelAfterSpy(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    QSignalSpy proxyBeforeSpy(m_proxy, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
+    QSignalSpy proxyAfterSpy(m_proxy, SIGNAL(rowsInserted(QModelIndex,int,int)));
+
+    QStandardItem *item = new QStandardItem(QString("new item"));
+    parentItem->appendRow(item);
+
+    QVERIFY(modelBeforeSpy.size() == 1 && 1 == proxyBeforeSpy.size());
+    QVERIFY(modelAfterSpy.size() == 1 && 1 == proxyAfterSpy.size());
+
+    QVERIFY(modelBeforeSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyBeforeSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelBeforeSpy.first().at(1) == proxyBeforeSpy.first().at(1));
+    QVERIFY(modelBeforeSpy.first().at(2) == proxyBeforeSpy.first().at(2));
+
+    QVERIFY(modelAfterSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyAfterSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelAfterSpy.first().at(1) == proxyAfterSpy.first().at(1));
+    QVERIFY(modelAfterSpy.first().at(2) == proxyAfterSpy.first().at(2));
+
+    verifyIdentity(m_model);
+
+}
+
+void tst_QIdentityProxyModel::removeRows()
+{
+    QStandardItem *parentItem = m_model->invisibleRootItem();
+    for (int i = 0; i < 4; ++i) {
+        QStandardItem *item = new QStandardItem(QString("item %0").arg(i));
+        parentItem->appendRow(item);
+        parentItem = item;
+    }
+
+    m_proxy->setSourceModel(m_model);
+
+    verifyIdentity(m_model);
+
+    QSignalSpy modelBeforeSpy(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));
+    QSignalSpy modelAfterSpy(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)));
+    QSignalSpy proxyBeforeSpy(m_proxy, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));
+    QSignalSpy proxyAfterSpy(m_proxy, SIGNAL(rowsRemoved(QModelIndex,int,int)));
+
+    const QModelIndex topLevel = m_model->index(0, 0, QModelIndex());
+    const QModelIndex secondLevel = m_model->index(0, 0, topLevel);
+    const QModelIndex thirdLevel = m_model->index(0, 0, secondLevel);
+
+    QVERIFY(thirdLevel.isValid());
+
+    m_model->removeRow(0, secondLevel);
+
+    QVERIFY(modelBeforeSpy.size() == 1 && 1 == proxyBeforeSpy.size());
+    QVERIFY(modelAfterSpy.size() == 1 && 1 == proxyAfterSpy.size());
+
+    QVERIFY(modelBeforeSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyBeforeSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelBeforeSpy.first().at(1) == proxyBeforeSpy.first().at(1));
+    QVERIFY(modelBeforeSpy.first().at(2) == proxyBeforeSpy.first().at(2));
+
+    QVERIFY(modelAfterSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyAfterSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelAfterSpy.first().at(1) == proxyAfterSpy.first().at(1));
+    QVERIFY(modelAfterSpy.first().at(2) == proxyAfterSpy.first().at(2));
+
+    verifyIdentity(m_model);
+}
+
+void tst_QIdentityProxyModel::moveRows()
+{
+    DynamicTreeModel model;
+
+    {
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(9);
+        insertCommand.doCommand();
+    }
+    {
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setAncestorRowNumbers(QList<int>() << 5);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(9);
+        insertCommand.doCommand();
+    }
+
+    m_proxy->setSourceModel(&model);
+
+    verifyIdentity(&model);
+
+    QSignalSpy modelBeforeSpy(&model, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)));
+    QSignalSpy modelAfterSpy(&model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+    QSignalSpy proxyBeforeSpy(m_proxy, SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)));
+    QSignalSpy proxyAfterSpy(m_proxy, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+
+    {
+        ModelMoveCommand moveCommand(&model, 0);
+        moveCommand.setAncestorRowNumbers(QList<int>() << 5);
+        moveCommand.setStartRow(3);
+        moveCommand.setEndRow(4);
+        moveCommand.setDestRow(1);
+        moveCommand.doCommand();
+    }
+
+    QVERIFY(modelBeforeSpy.size() == 1 && 1 == proxyBeforeSpy.size());
+    QVERIFY(modelAfterSpy.size() == 1 && 1 == proxyAfterSpy.size());
+
+    QVERIFY(modelBeforeSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyBeforeSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelBeforeSpy.first().at(1) == proxyBeforeSpy.first().at(1));
+    QVERIFY(modelBeforeSpy.first().at(2) == proxyBeforeSpy.first().at(2));
+    QVERIFY(modelBeforeSpy.first().at(3).value<QModelIndex>() == m_proxy->mapToSource(proxyBeforeSpy.first().at(3).value<QModelIndex>()));
+    QVERIFY(modelBeforeSpy.first().at(4) == proxyBeforeSpy.first().at(4));
+
+    QVERIFY(modelAfterSpy.first().first().value<QModelIndex>() == m_proxy->mapToSource(proxyAfterSpy.first().first().value<QModelIndex>()));
+    QVERIFY(modelAfterSpy.first().at(1) == proxyAfterSpy.first().at(1));
+    QVERIFY(modelAfterSpy.first().at(2) == proxyAfterSpy.first().at(2));
+    QVERIFY(modelAfterSpy.first().at(3).value<QModelIndex>() == m_proxy->mapToSource(proxyAfterSpy.first().at(3).value<QModelIndex>()));
+    QVERIFY(modelAfterSpy.first().at(4) == proxyAfterSpy.first().at(4));
+
+    verifyIdentity(&model);
+
+    m_proxy->setSourceModel(0);
+}
+
+void tst_QIdentityProxyModel::reset()
+{
+    DynamicTreeModel model;
+
+    {
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(9);
+        insertCommand.doCommand();
+    }
+    {
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setAncestorRowNumbers(QList<int>() << 5);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(9);
+        insertCommand.doCommand();
+    }
+
+    m_proxy->setSourceModel(&model);
+
+    verifyIdentity(&model);
+
+    QSignalSpy modelBeforeSpy(&model, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy modelAfterSpy(&model, SIGNAL(modelReset()));
+    QSignalSpy proxyBeforeSpy(m_proxy, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy proxyAfterSpy(m_proxy, SIGNAL(modelReset()));
+
+    {
+        ModelResetCommandFixed resetCommand(&model, 0);
+        resetCommand.setAncestorRowNumbers(QList<int>() << 5);
+        resetCommand.setStartRow(3);
+        resetCommand.setEndRow(4);
+        resetCommand.setDestRow(1);
+        resetCommand.doCommand();
+    }
+
+    QVERIFY(modelBeforeSpy.size() == 1 && 1 == proxyBeforeSpy.size());
+    QVERIFY(modelAfterSpy.size() == 1 && 1 == proxyAfterSpy.size());
+
+    verifyIdentity(&model);
+    m_proxy->setSourceModel(0);
+}
+
+QTEST_MAIN(tst_QIdentityProxyModel)
+#include "tst_qidentityproxymodel.moc"
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 6e20fb2..d91b068 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -101,6 +101,7 @@ private slots:
     void testDifferentModels();
 
     void testValidRangesInSelectionsAfterReset();
+    void testChainedSelectionClear();
 
 private:
     QAbstractItemModel *model;
@@ -2655,5 +2656,58 @@ void tst_QItemSelectionModel::testValidRangesInSelectionsAfterReset()
     model.setStringList(strings);
 }
 
+class DuplicateItemSelectionModel : public QItemSelectionModel
+{
+  Q_OBJECT
+public:
+  DuplicateItemSelectionModel(QItemSelectionModel *target, QAbstractItemModel *model, QObject *parent = 0)
+    : QItemSelectionModel(model, parent), m_target(target)
+  {
+
+  }
+
+  void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command)
+  {
+      QItemSelectionModel::select(selection, command);
+      m_target->select(selection, command);
+  }
+
+  using QItemSelectionModel::select;
+
+private:
+  QItemSelectionModel *m_target;
+
+};
+
+void tst_QItemSelectionModel::testChainedSelectionClear()
+{
+    QStringListModel model(QStringList() << "Apples" << "Pears");
+
+    QItemSelectionModel selectionModel(&model, 0);
+    DuplicateItemSelectionModel duplicate(&selectionModel, &model, 0);
+
+    duplicate.select(model.index(0, 0), QItemSelectionModel::Select);
+
+    {
+        QModelIndexList selectedIndexes = selectionModel.selection().indexes();
+        QModelIndexList duplicatedIndexes = duplicate.selection().indexes();
+
+        QVERIFY(selectedIndexes.size() == duplicatedIndexes.size());
+        QVERIFY(selectedIndexes.size() == 1);
+        QVERIFY(selectedIndexes.first() == model.index(0, 0));
+    }
+
+    duplicate.clearSelection();
+
+    {
+        QModelIndexList selectedIndexes = selectionModel.selection().indexes();
+        QModelIndexList duplicatedIndexes = duplicate.selection().indexes();
+
+        QVERIFY(selectedIndexes.size() == duplicatedIndexes.size());
+        QVERIFY(selectedIndexes.size() == 0);
+    }
+
+}
+
 QTEST_MAIN(tst_QItemSelectionModel)
 #include "tst_qitemselectionmodel.moc"
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 9176174..f45481c 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -282,6 +282,12 @@ private slots:
     void validateAndSet();
 #endif
 
+    void bidiVisualMovement_data();
+    void bidiVisualMovement();
+
+    void bidiLogicalMovement_data();
+    void bidiLogicalMovement();
+
 protected slots:
 #ifdef QT3_SUPPORT
     void lostFocus();
@@ -3760,5 +3766,135 @@ void tst_QLineEdit::QTBUG13520_textNotVisible()
 }
 
 
+void tst_QLineEdit::bidiVisualMovement_data()
+{
+    QTest::addColumn<QString>("logical");
+    QTest::addColumn<int>("basicDir");
+    QTest::addColumn<IntList>("positionList");
+
+    QTest::newRow("Latin text")
+        << QString::fromUtf8("abc")
+        << (int) QChar::DirL
+        << (IntList() << 0 << 1 << 2 << 3);
+    QTest::newRow("Hebrew text, one item")
+        << QString::fromUtf8("\327\220\327\221\327\222")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 3);
+    QTest::newRow("Hebrew text after Latin text")
+        << QString::fromUtf8("abc\327\220\327\221\327\222")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 6 << 5 << 4 << 3);
+    QTest::newRow("Latin text after Hebrew text")
+        << QString::fromUtf8("\327\220\327\221\327\222abc")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 6 << 5 << 4 << 3);
+    QTest::newRow("LTR, 3 items")
+        << QString::fromUtf8("abc\327\220\327\221\327\222abc")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 9);
+    QTest::newRow("RTL, 3 items")
+        << QString::fromUtf8("\327\220\327\221\327\222abc\327\220\327\221\327\222")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 9);
+    QTest::newRow("LTR, 4 items")
+        << QString::fromUtf8("abc\327\220\327\221\327\222abc\327\220\327\221\327\222")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 12 << 11 << 10 << 9);
+    QTest::newRow("RTL, 4 items")
+        << QString::fromUtf8("\327\220\327\221\327\222abc\327\220\327\221\327\222abc")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 12 << 11 << 10 << 9);
+}
+
+void tst_QLineEdit::bidiVisualMovement()
+{
+    QFETCH(QString, logical);
+    QFETCH(int,     basicDir);
+    QFETCH(IntList, positionList);
+
+    QLineEdit le;
+    le.setText(logical);
+
+    le.setCursorMoveStyle(QTextCursor::Visual);
+    le.setCursorPosition(0);
+
+    bool moved;
+    int i = 0, oldPos, newPos = 0;
+
+    do {
+        oldPos = newPos;
+        QVERIFY(oldPos == positionList[i]);
+        if (basicDir == QChar::DirL) {
+            QTest::keyClick(&le, Qt::Key_Right);
+        } else
+            QTest::keyClick(&le, Qt::Key_Left);
+        newPos = le.cursorPosition();
+        moved = (oldPos != newPos);
+        i++;
+    } while (moved);
+
+    QVERIFY(i == positionList.size());
+
+    do {
+        i--;
+        oldPos = newPos;
+        QVERIFY(oldPos == positionList[i]);
+        if (basicDir == QChar::DirL) {
+            QTest::keyClick(&le, Qt::Key_Left);
+        } else
+        {
+            QTest::keyClick(&le, Qt::Key_Right);
+        }
+        newPos = le.cursorPosition();
+        moved = (oldPos != newPos);
+    } while (moved && i >= 0);
+}
+
+void tst_QLineEdit::bidiLogicalMovement_data()
+{
+    bidiVisualMovement_data();
+}
+
+void tst_QLineEdit::bidiLogicalMovement()
+{
+    QFETCH(QString, logical);
+    QFETCH(int,     basicDir);
+
+    QLineEdit le;
+    le.setText(logical);
+
+    le.setCursorMoveStyle(QTextCursor::Logical);
+    le.setCursorPosition(0);
+
+    bool moved;
+    int i = 0, oldPos, newPos = 0;
+
+    do {
+        oldPos = newPos;
+        QVERIFY(oldPos == i);
+        if (basicDir == QChar::DirL) {
+            QTest::keyClick(&le, Qt::Key_Right);
+        } else
+            QTest::keyClick(&le, Qt::Key_Left);
+        newPos = le.cursorPosition();
+        moved = (oldPos != newPos);
+        i++;
+    } while (moved);
+
+    do {
+        i--;
+        oldPos = newPos;
+        QVERIFY(oldPos == i);
+        if (basicDir == QChar::DirL) {
+            QTest::keyClick(&le, Qt::Key_Left);
+        } else
+        {
+            QTest::keyClick(&le, Qt::Key_Right);
+        }
+        newPos = le.cursorPosition();
+        moved = (oldPos != newPos);
+    } while (moved && i >= 0);
+}
+
 QTEST_MAIN(tst_QLineEdit)
 #include "tst_qlineedit.moc"
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index c21514b..76bc5d63 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -77,6 +77,7 @@
 # define SRCDIR "."
 #endif
 
+Q_DECLARE_METATYPE(QGradientStops)
 Q_DECLARE_METATYPE(QLine)
 Q_DECLARE_METATYPE(QRect)
 Q_DECLARE_METATYPE(QSize)
@@ -189,6 +190,7 @@ private slots:
     void fillRect_stretchToDeviceMode();
     void monoImages();
 
+    void linearGradientSymmetry_data();
     void linearGradientSymmetry();
     void gradientInterpolation();
 
@@ -3983,8 +3985,42 @@ static QLinearGradient inverseGradient(QLinearGradient g)
     return g2;
 }
 
+void tst_QPainter::linearGradientSymmetry_data()
+{
+    QTest::addColumn<QGradientStops>("stops");
+
+    if (sizeof(qreal) != sizeof(float)) {
+        QGradientStops stops;
+        stops << qMakePair(qreal(0.0), QColor(Qt::blue));
+        stops << qMakePair(qreal(0.2), QColor(220, 220, 220, 0));
+        stops << qMakePair(qreal(0.6), QColor(Qt::red));
+        stops << qMakePair(qreal(0.9), QColor(220, 220, 220, 255));
+        stops << qMakePair(qreal(1.0), QColor(Qt::black));
+        QTest::newRow("multiple stops") << stops;
+    }
+
+    {
+        QGradientStops stops;
+        stops << qMakePair(qreal(0.0), QColor(Qt::blue));
+        stops << qMakePair(qreal(1.0), QColor(Qt::black));
+        QTest::newRow("two stops") << stops;
+    }
+
+    if (sizeof(qreal) != sizeof(float)) {
+        QGradientStops stops;
+        stops << qMakePair(qreal(0.3), QColor(Qt::blue));
+        stops << qMakePair(qreal(0.6), QColor(Qt::black));
+        QTest::newRow("two stops 2") << stops;
+    }
+}
+
 void tst_QPainter::linearGradientSymmetry()
 {
+#ifdef Q_WS_QWS
+    QSKIP("QWS has limited resolution in the gradient color table", SkipAll);
+#else
+    QFETCH(QGradientStops, stops);
+
     QImage a(64, 8, QImage::Format_ARGB32_Premultiplied);
     QImage b(64, 8, QImage::Format_ARGB32_Premultiplied);
 
@@ -3992,11 +4028,7 @@ void tst_QPainter::linearGradientSymmetry()
     b.fill(0);
 
     QLinearGradient gradient(QRectF(b.rect()).topLeft(), QRectF(b.rect()).topRight());
-    gradient.setColorAt(0.0, Qt::blue);
-    gradient.setColorAt(0.2, QColor(220, 220, 220, 0));
-    gradient.setColorAt(0.6, Qt::red);
-    gradient.setColorAt(0.9, QColor(220, 220, 220, 255));
-    gradient.setColorAt(1.0, Qt::black);
+    gradient.setStops(stops);
 
     QPainter pa(&a);
     pa.fillRect(a.rect(), gradient);
@@ -4008,6 +4040,7 @@ void tst_QPainter::linearGradientSymmetry()
 
     b = b.mirrored(true);
     QCOMPARE(a, b);
+#endif
 }
 
 void tst_QPainter::gradientInterpolation()
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 4d032e8..4ba51de 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -1337,7 +1337,7 @@ void tst_QPixmap::toSymbianCFbsBitmap()
 
 void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
 {
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
     class Thread : public QThread
     {
     public:
@@ -1370,7 +1370,7 @@ void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
     thread.wait();
 #endif
 
-#endif // !defined(Q_WS_WIN)
+#endif // !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
 }
 
 void tst_QPixmap::refUnref()
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index d26f0cd..8e7f393 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -149,7 +149,6 @@ private slots:
 
     void testMultipleProxiesWithSelection();
     void mapSelectionFromSource();
-    void testResetInternalData();
     void filteredColumns();
 
 protected:
@@ -3183,142 +3182,6 @@ void tst_QSortFilterProxyModel::taskQTBUG_10287_unnecessaryMapCreation()
     // No assert failure, it passes.
 }
 
-/**
- * A proxy which changes the background color for items ending in 'y' or 'r'
- */
-class CustomDataProxy : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-public:
-    CustomDataProxy(QObject *parent = 0)
-        : QSortFilterProxyModel(parent)
-    {
-        setDynamicSortFilter(true);
-    }
-
-    void setSourceModel(QAbstractItemModel *sourceModel)
-    {
-        // It would be possible to use only the modelReset signal of the source model to clear
-        // the data in *this, however, this requires that the slot is connected
-        // before QSortFilterProxyModel::setSourceModel is called, and even then depends
-        // on the order of invokation of slots being the same as the order of connection.
-        // ie, not reliable.
-//         connect(sourceModel, SIGNAL(modelReset()), SLOT(resetInternalData()));
-        QSortFilterProxyModel::setSourceModel(sourceModel);
-        // Making the connect after the setSourceModel call clears the data too late.
-//         connect(sourceModel, SIGNAL(modelReset()), SLOT(resetInternalData()));
-
-        // This could be done in data(), but the point is to need to cache something in the proxy
-        // which needs to be cleared on reset.
-        for (int i = 0; i < sourceModel->rowCount(); ++i)
-        {
-            if (sourceModel->index(i, 0).data().toString().endsWith(QLatin1Char('y')))
-            {
-                m_backgroundColours.insert(i, Qt::blue);
-            } else if (sourceModel->index(i, 0).data().toString().endsWith(QLatin1Char('r')))
-            {
-                m_backgroundColours.insert(i, Qt::red);
-            }
-        }
-    }
-
-    QVariant data(const QModelIndex &index, int role) const
-    {
-        if (role != Qt::BackgroundRole)
-            return QSortFilterProxyModel::data(index, role);
-        return m_backgroundColours.value(index.row());
-    }
-
-private slots:
-  void resetInternalData()
-  {
-      m_backgroundColours.clear();
-  }
-
-private:
-    QHash<int, QColor> m_backgroundColours;
-};
-
-class ModelObserver : public QObject
-{
-    Q_OBJECT
-public:
-  ModelObserver(QAbstractItemModel *model, QObject *parent = 0)
-    : QObject(parent), m_model(model)
-  {
-    connect(m_model, SIGNAL(modelAboutToBeReset()), SLOT(modelAboutToBeReset()));
-    connect(m_model, SIGNAL(modelReset()), SLOT(modelReset()));
-  }
-
-public slots:
-  void modelAboutToBeReset()
-  {
-    int reds = 0, blues = 0;
-    for (int i = 0; i < m_model->rowCount(); ++i)
-    {
-      QColor color = m_model->index(i, 0).data(Qt::BackgroundRole).value<QColor>();
-      if (color == Qt::blue)
-        ++blues;
-      if (color == Qt::red)
-        ++reds;
-    }
-    QCOMPARE(blues, 11);
-    QCOMPARE(reds, 4);
-  }
-
-  void modelReset()
-  {
-    int reds = 0, blues = 0;
-    for (int i = 0; i < m_model->rowCount(); ++i)
-    {
-      QColor color = m_model->index(i, 0).data(Qt::BackgroundRole).value<QColor>();
-      if (color == Qt::blue)
-        ++blues;
-      if (color == Qt::red)
-        ++reds;
-    }
-    QCOMPARE(reds, 0);
-    QCOMPARE(blues, 0);
-  }
-
-private:
-  QAbstractItemModel * const m_model;
-
-};
-
-void tst_QSortFilterProxyModel::testResetInternalData()
-{
-
-    QStringListModel model(QStringList() << "Monday"
-                                         << "Tuesday"
-                                         << "Wednesday"
-                                         << "Thursday"
-                                         << "Friday"
-                                         << "January"
-                                         << "February"
-                                         << "March"
-                                         << "April"
-                                         << "May"
-                                         << "Saturday"
-                                         << "June"
-                                         << "Sunday"
-                                         << "July"
-                                         << "August"
-                                         << "September"
-                                         << "October"
-                                         << "November"
-                                         << "December");
-
-    CustomDataProxy proxy;
-    proxy.setSourceModel(&model);
-
-    ModelObserver observer(&proxy);
-
-    // Cause the source model to reset.
-    model.setStringList(QStringList() << "Spam" << "Eggs");
-}
-
 class FilteredColumnProxyModel : public QSortFilterProxyModel
 {
   Q_OBJECT
diff --git a/tests/auto/qtablewidget/tst_qtablewidget.cpp b/tests/auto/qtablewidget/tst_qtablewidget.cpp
index d17e064..40aece4 100644
--- a/tests/auto/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/qtablewidget/tst_qtablewidget.cpp
@@ -41,6 +41,7 @@
 
 
 #include <QtTest/QtTest>
+#include "../../shared/util.h"
 #include <qeventloop.h>
 #include <qlist.h>
 #include <qpair.h>
@@ -1472,7 +1473,7 @@ void tst_QTableWidget::task219380_removeLastRow()
     testWidget->removeRow(19); //we remove the last row
 
     //we make sure the editor is at the cell position
-    QCOMPARE(testWidget->cellWidget(18, 0)->geometry(), testWidget->visualItemRect(&item));
+    QTRY_COMPARE(testWidget->cellWidget(18, 0)->geometry(), testWidget->visualItemRect(&item));
 }
 
 void tst_QTableWidget::task262056_sortDuplicate()
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 9ca17b9..5a64593 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -42,7 +42,6 @@
 
 #include <QtTest/QtTest>
 
-
 #include <qtextedit.h>
 #include <qtextcursor.h>
 #include <qtextlist.h>
@@ -69,6 +68,7 @@ typedef QList<keyPairType> pairListType;
 Q_DECLARE_METATYPE(pairListType);
 Q_DECLARE_METATYPE(keyPairType);
 Q_DECLARE_METATYPE(QList<bool>);
+Q_DECLARE_METATYPE(QList<int>);
 
 #ifdef Q_WS_MAC
 #include <Carbon/Carbon.h>
@@ -205,6 +205,11 @@ private slots:
 #ifndef QT_NO_CONTEXTMENU
     void taskQTBUG_7902_contextMenuCrash();
 #endif
+    void bidiVisualMovement_data();
+    void bidiVisualMovement();
+
+    void bidiLogicalMovement_data();
+    void bidiLogicalMovement();
 
 private:
     void createSelection();
@@ -2235,5 +2240,147 @@ void tst_QTextEdit::taskQTBUG_7902_contextMenuCrash()
 }
 #endif
 
+void tst_QTextEdit::bidiVisualMovement_data()
+{
+    QTest::addColumn<QString>("logical");
+    QTest::addColumn<int>("basicDir");
+    QTest::addColumn<QList<int> >("positionList");
+
+    QTest::newRow("Latin text")
+        << QString::fromUtf8("abc")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 3);
+    QTest::newRow("Hebrew text, one item")
+        << QString::fromUtf8("\327\220\327\221\327\222")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 3);
+    QTest::newRow("Hebrew text after Latin text")
+        << QString::fromUtf8("abc\327\220\327\221\327\222")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 6 << 5 << 4 << 3);
+    QTest::newRow("Latin text after Hebrew text")
+        << QString::fromUtf8("\327\220\327\221\327\222abc")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 6 << 5 << 4 << 3);
+    QTest::newRow("LTR, 3 items")
+        << QString::fromUtf8("abc\327\220\327\221\327\222abc")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 9);
+    QTest::newRow("RTL, 3 items")
+        << QString::fromUtf8("\327\220\327\221\327\222abc\327\220\327\221\327\222")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 9);
+    QTest::newRow("LTR, 4 items")
+        << QString::fromUtf8("abc\327\220\327\221\327\222abc\327\220\327\221\327\222")
+        << (int) QChar::DirL
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 12 << 11 << 10 << 9);
+    QTest::newRow("RTL, 4 items")
+        << QString::fromUtf8("\327\220\327\221\327\222abc\327\220\327\221\327\222abc")
+        << (int) QChar::DirR
+        << (QList<int>() << 0 << 1 << 2 << 5 << 4 << 3 << 6 << 7 << 8 << 12 << 11 << 10 << 9);
+}
+
+void tst_QTextEdit::bidiVisualMovement()
+{
+    QFETCH(QString,      logical);
+    QFETCH(int,          basicDir);
+    QFETCH(QList<int>,   positionList);
+
+    ed->setText(logical);
+
+    QTextOption option = ed->document()->defaultTextOption();
+    option.setTextDirection(basicDir == QChar::DirL ? Qt::LeftToRight : Qt::RightToLeft);
+    ed->document()->setDefaultTextOption(option);
+
+    ed->document()->setDefaultCursorMoveStyle(QTextCursor::Visual);
+    ed->moveCursor(QTextCursor::Start);
+    ed->show();
+
+    bool moved;
+    int i = 0, oldPos, newPos = 0;
+
+    do {
+        oldPos = newPos;
+        QVERIFY(oldPos == positionList[i]);
+        if (basicDir == QChar::DirL) {
+            ed->moveCursor(QTextCursor::Right);
+        } else
+        {
+            ed->moveCursor(QTextCursor::Left);
+        }
+        newPos = ed->textCursor().position();
+        moved = (oldPos != newPos);
+        i++;
+    } while (moved);
+
+    QVERIFY(i == positionList.size());
+
+    do {
+        i--;
+        oldPos = newPos;
+        QVERIFY(oldPos == positionList[i]);
+        if (basicDir == QChar::DirL) {
+            ed->moveCursor(QTextCursor::Left);
+        } else
+        {
+            ed->moveCursor(QTextCursor::Right);
+        }
+        newPos = ed->textCursor().position();
+        moved = (oldPos != newPos);
+    } while (moved && i >= 0);
+}
+
+void tst_QTextEdit::bidiLogicalMovement_data()
+{
+    bidiVisualMovement_data();
+}
+
+void tst_QTextEdit::bidiLogicalMovement()
+{
+    QFETCH(QString,      logical);
+    QFETCH(int,          basicDir);
+
+    ed->setText(logical);
+
+    QTextOption option = ed->document()->defaultTextOption();
+    option.setTextDirection(basicDir == QChar::DirL ? Qt::LeftToRight : Qt::RightToLeft);
+    ed->document()->setDefaultTextOption(option);
+
+    ed->document()->setDefaultCursorMoveStyle(QTextCursor::Logical);
+    ed->moveCursor(QTextCursor::Start);
+    ed->show();
+
+    bool moved;
+    int i = 0, oldPos, newPos = 0;
+
+    do {
+        oldPos = newPos;
+        QVERIFY(oldPos == i);
+        if (basicDir == QChar::DirL) {
+            ed->moveCursor(QTextCursor::Right);
+        } else
+        {
+            ed->moveCursor(QTextCursor::Left);
+        }
+        newPos = ed->textCursor().position();
+        moved = (oldPos != newPos);
+        i++;
+    } while (moved);
+
+    do {
+        i--;
+        oldPos = newPos;
+        QVERIFY(oldPos == i);
+        if (basicDir == QChar::DirL) {
+            ed->moveCursor(QTextCursor::Left);
+        } else
+        {
+            ed->moveCursor(QTextCursor::Right);
+        }
+        newPos = ed->textCursor().position();
+        moved = (oldPos != newPos);
+    } while (moved && i >= 0);
+}
+
 QTEST_MAIN(tst_QTextEdit)
 #include "tst_qtextedit.moc"
diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp
index a813727..5667d40 100644
--- a/tests/auto/qwizard/tst_qwizard.cpp
+++ b/tests/auto/qwizard/tst_qwizard.cpp
@@ -1770,8 +1770,11 @@ public:
 
     ~TestWizard()
     {
-        foreach (int id, pageIds)
-            delete page(id);
+        foreach (int id, pageIds) {
+            QWizardPage *page_to_delete = page(id);
+            removePage(id);
+            delete page_to_delete;
+	}
     }
 
     void applyOperations(const QList<Operation *> &operations)
@@ -2548,8 +2551,8 @@ void tst_QWizard::task177022_setFixedSize()
     QWizard wiz;
     QWizardPage page1;
     QWizardPage page2;
-    wiz.addPage(&page1);
-    wiz.addPage(&page2);
+    int page1_id = wiz.addPage(&page1);
+    int page2_id = wiz.addPage(&page2);
     wiz.setFixedSize(width, height);
     if (wiz.wizardStyle() == QWizard::AeroStyle)
         QEXPECT_FAIL("", "this probably relates to non-client area hack for AeroStyle titlebar "
@@ -2576,6 +2579,8 @@ void tst_QWizard::task177022_setFixedSize()
     QCOMPARE(wiz.maximumWidth(), width);
     QCOMPARE(wiz.maximumHeight(), height);
 
+    wiz.removePage(page1_id);
+    wiz.removePage(page2_id);
 }
 
 void tst_QWizard::task248107_backButton()