Implement layoutDirection property on Row, Grid, Flow

Task-number: QTBUG-11042
Reviewed-by: Joona Petrell

9 files changed, 489 insertions, 10 deletions

diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
index 51c8134..ee4e104 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
@@ -1,16 +1,19 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     width: 300; height: 200;
 
-    property bool leftToRight: false
+    property int flowLayout: 1
 
     Flow {
         objectName: "flow"
-        flow: leftToRight ? Flow.LeftToRight : Flow.TopToBottom
+        layoutDirection: (flowLayout == 2) ? Qt.RightToLeft : Qt.LeftToRight
+        flow: (flowLayout == 1) ? Flow.TopToBottom : Flow.LeftToRight;
+
         spacing: 20
         anchors.horizontalCenter: parent.horizontalCenter
         Rectangle { color: "red"; width: 100; height: 50 }
         Rectangle { color: "blue"; width: 100; height: 50 }
     }
 }
+
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml
new file mode 100644
index 0000000..ec1d666
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml
@@ -0,0 +1,44 @@
+import QtQuick 1.1
+
+Item {
+    height: 90
+    width: 480
+    property bool testRightToLeft: false
+
+    Flow {
+        objectName: "flow"
+        height: parent.height
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
+        flow: Flow.TopToBottom
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
index 2810234..7c124a3 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 90
     height: 480
+    property bool testRightToLeft: false
+
     Flow {
         objectName: "flow"
         width: parent.width
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
index e13f078..3dcbed1 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: true
+
     Grid {
         objectName: "grid"
         columns: 3
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         add: Transition {
             NumberAnimation {
                 properties: "x,y";
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml
new file mode 100644
index 0000000..0ec1f37
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml
@@ -0,0 +1,41 @@
+import QtQuick 1.1
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        objectName: "grid"
+        columns: 3
+        layoutDirection: Qt.RightToLeft
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
index 5b064cd..3c95f53 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
@@ -1,10 +1,13 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         add: Transition {
             NumberAnimation {
                 properties: "x";
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
index 2b46bca..64bedb0 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
         spacing: 10
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
index 919cecc..e1a9652 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
@@ -1,10 +1,13 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 254349f..cdf6933 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -62,20 +62,28 @@ public:
 
 private slots:
     void test_horizontal();
+    void test_horizontal_rtl();
     void test_horizontal_spacing();
+    void test_horizontal_spacing_rightToLeft();
     void test_horizontal_animated();
+    void test_horizontal_animated_rightToLeft();
     void test_vertical();
     void test_vertical_spacing();
     void test_vertical_animated();
     void test_grid();
     void test_grid_topToBottom();
+    void test_grid_rightToLeft();
     void test_grid_spacing();
     void test_grid_animated();
+    void test_grid_animated_rightToLeft();
     void test_grid_zero_columns();
     void test_propertychanges();
     void test_repeater();
     void test_flow();
+    void test_flow_rightToLeft();
+    void test_flow_topToBottom();
     void test_flow_resize();
+    void test_flow_resize_rightToLeft();
     void test_flow_implicit_resize();
     void test_conflictinganchors();
     void test_vertical_qgraphicswidget();
@@ -91,6 +99,8 @@ void tst_QDeclarativePositioners::test_horizontal()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -114,10 +124,41 @@ void tst_QDeclarativePositioners::test_horizontal()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_rtl()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 60.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 40.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 0.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QCOMPARE(row->width(), 110.0);
+    QCOMPARE(row->height(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_horizontal_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -141,10 +182,41 @@ void tst_QDeclarativePositioners::test_horizontal_spacing()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_spacing_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 80.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 00.0);
+    QCOMPARE(three->y(), 0.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QCOMPARE(row->width(), 130.0);
+    QCOMPARE(row->height(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_horizontal_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -193,6 +265,60 @@ void tst_QDeclarativePositioners::test_horizontal_animated()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_animated_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    //Note that they animate in
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(three->x(), -100.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QVERIFY(row);
+    QCOMPARE(row->width(), 100.0);
+    QCOMPARE(row->height(), 50.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->x(), 50.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(three->x(), 0.0);
+    QTRY_COMPARE(three->y(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+
+    // New size should be immediate
+    QCOMPARE(row->width(), 150.0);
+    QCOMPARE(row->height(), 50.0);
+
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(one->x(), 50.0);
+    QCOMPARE(two->x(), -100.0);
+
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(two->x(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_vertical()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml");
@@ -364,6 +490,40 @@ void tst_QDeclarativePositioners::test_grid_topToBottom()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_grid_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-righttoleft.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 70.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 70.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 60.0);
+    QCOMPARE(five->y(), 50.0);
+
+    QDeclarativeGrid *grid = canvas->rootObject()->findChild<QDeclarativeGrid*>("grid");
+    QCOMPARE(grid->layoutDirection(), Qt::RightToLeft);
+    QCOMPARE(grid->width(), 120.0);
+    QCOMPARE(grid->height(), 100.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_grid_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
@@ -401,6 +561,8 @@ void tst_QDeclarativePositioners::test_grid_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     //Note that all animate in
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
@@ -478,6 +640,89 @@ void tst_QDeclarativePositioners::test_grid_animated()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_grid_animated_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    //Note that all animate in
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(one->y(), -100.0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->x(), -100.0);
+    QCOMPARE(three->y(), -100.0);
+
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QCOMPARE(four->x(), -100.0);
+    QCOMPARE(four->y(), -100.0);
+
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+    QCOMPARE(five->x(), -100.0);
+    QCOMPARE(five->y(), -100.0);
+
+    QDeclarativeItem *grid = canvas->rootObject()->findChild<QDeclarativeItem*>("grid");
+    QVERIFY(grid);
+    QCOMPARE(grid->width(), 150.0);
+    QCOMPARE(grid->height(), 100.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->y(), -100.0);
+    QTRY_COMPARE(two->x(), -100.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(three->x(), 50.0);
+    QTRY_COMPARE(four->y(), 0.0);
+    QTRY_COMPARE(four->x(), 0.0);
+    QTRY_COMPARE(five->y(), 50.0);
+    QTRY_COMPARE(five->x(), 100.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QCOMPARE(grid->width(), 150.0);
+    QCOMPARE(grid->height(), 100.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(one->x(), 100.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 100.0);
+    QCOMPARE(five->y(), 50.0);
+    //Let the animation complete
+    QTRY_COMPARE(two->x(), 50.0);
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(three->x(), 0.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(four->x(), 100.0);
+    QTRY_COMPARE(four->y(), 50.0);
+    QTRY_COMPARE(five->x(), 50.0);
+    QTRY_COMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_grid_zero_columns()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/gridzerocolumns.qml");
@@ -597,6 +842,8 @@ void tst_QDeclarativePositioners::test_flow()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
     QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
@@ -627,6 +874,95 @@ void tst_QDeclarativePositioners::test_flow()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_flow_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 40.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 20.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 40.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 40.0);
+    QCOMPARE(four->y(), 70.0);
+    QCOMPARE(five->x(), 30.0);
+    QCOMPARE(five->y(), 70.0);
+
+    QDeclarativeItem *flow = canvas->rootObject()->findChild<QDeclarativeItem*>("flow");
+    QVERIFY(flow);
+    QCOMPARE(flow->width(), 90.0);
+    QCOMPARE(flow->height(), 120.0);
+
+    delete canvas;
+}
+
+void tst_QDeclarativePositioners::test_flow_topToBottom()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest-toptobottom.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(four->y(), 00.0);
+    QCOMPARE(five->x(), 100.0);
+    QCOMPARE(five->y(), 50.0);
+
+    QDeclarativeItem *flow = canvas->rootObject()->findChild<QDeclarativeItem*>("flow");
+    QVERIFY(flow);
+    QCOMPARE(flow->height(), 90.0);
+    QCOMPARE(flow->width(), 150.0);
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QVERIFY(flow);
+    QCOMPARE(flow->height(), 90.0);
+    QCOMPARE(flow->width(), 150.0);
+
+    QCOMPARE(one->x(), 100.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 80.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 40.0);
+    QCOMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_flow_resize()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
@@ -634,6 +970,7 @@ void tst_QDeclarativePositioners::test_flow_resize()
     QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
     QVERIFY(root);
     root->setWidth(125);
+    root->setProperty("testRightToLeft", false);
 
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
@@ -660,6 +997,40 @@ void tst_QDeclarativePositioners::test_flow_resize()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_flow_resize_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(root);
+    root->setWidth(125);
+    root->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 75.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 55.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 5.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 75.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 65.0);
+    QCOMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_flow_implicit_resize()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flow-testimplicitsize.qml");
@@ -671,16 +1042,21 @@ void tst_QDeclarativePositioners::test_flow_implicit_resize()
     QCOMPARE(flow->width(), 100.0);
     QCOMPARE(flow->height(), 120.0);
 
-    canvas->rootObject()->setProperty("leftToRight", true);
+    canvas->rootObject()->setProperty("flowLayout", 0);
     QCOMPARE(flow->flow(), QDeclarativeFlow::LeftToRight);
     QCOMPARE(flow->width(), 220.0);
     QCOMPARE(flow->height(), 50.0);
 
-    canvas->rootObject()->setProperty("leftToRight", false);
+    canvas->rootObject()->setProperty("flowLayout", 1);
     QCOMPARE(flow->flow(), QDeclarativeFlow::TopToBottom);
     QCOMPARE(flow->width(), 100.0);
     QCOMPARE(flow->height(), 120.0);
 
+    canvas->rootObject()->setProperty("flowLayout", 2);
+    QCOMPARE(flow->layoutDirection(), Qt::RightToLeft);
+    QCOMPARE(flow->width(), 220.0);
+    QCOMPARE(flow->height(), 50.0);
+
     delete canvas;
 }