diff options
17 files changed, 114 insertions, 118 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index 3ef37f9..2f68d73 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -267,7 +267,7 @@ inline QString AnchorVertex::toString() const const AnchorVertexPair *vp = static_cast<const AnchorVertexPair *>(this); return QString::fromAscii("(%1, %2)").arg(vp->m_first->toString()).arg(vp->m_second->toString()); } else if (!m_item) { - return QString::fromAscii("NULL_%1").arg(int(this)); + return "";//QString::fromAscii("NULL_%1").arg(int(this)); } QString edge; switch (m_edge) { diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/anchors/data/anchors.qml index 765e5b6..b3fba30 100644 --- a/tests/auto/declarative/anchors/data/anchors.qml +++ b/tests/auto/declarative/anchors/data/anchors.qml @@ -4,130 +4,130 @@ Rectangle { color: "white" width: 240 height: 320 - Rectangle { id: MasterRect; objectName: "MasterRect"; x: 26; width: 96; height: 20; color: "red" } + Rectangle { id: masterRect; objectName: "masterRect"; x: 26; width: 96; height: 20; color: "red" } Rectangle { - id: Rect1; objectName: "Rect1" + id: rect1; objectName: "rect1" y: 20; width: 10; height: 10 - anchors.left: MasterRect.left + anchors.left: masterRect.left } Rectangle { - id: Rect2; objectName: "Rect2" + id: rect2; objectName: "rect2" y: 20; width: 10; height: 10 - anchors.left: MasterRect.right + anchors.left: masterRect.right } Rectangle { - id: Rect3; objectName: "Rect3" + id: rect3; objectName: "rect3" y: 20; width: 10; height: 10 - anchors.left: MasterRect.horizontalCenter + anchors.left: masterRect.horizontalCenter } Rectangle { - id: Rect4; objectName: "Rect4" + id: rect4; objectName: "rect4" y: 30; width: 10; height: 10 - anchors.right: MasterRect.left + anchors.right: masterRect.left } Rectangle { - id: Rect5; objectName: "Rect5" + id: rect5; objectName: "rect5" y: 30; width: 10; height: 10 - anchors.right: MasterRect.right + anchors.right: masterRect.right } Rectangle { - id: Rect6; objectName: "Rect6" + id: rect6; objectName: "rect6" y: 30; width: 10; height: 10 - anchors.right: MasterRect.horizontalCenter + anchors.right: masterRect.horizontalCenter } Rectangle { - id: Rect7; objectName: "Rect7" + id: rect7; objectName: "rect7" y: 50; width: 10; height: 10 anchors.left: parent.left } Rectangle { - id: Rect8; objectName: "Rect8" + id: rect8; objectName: "rect8" y: 50; width: 10; height: 10 anchors.left: parent.right } Rectangle { - id: Rect9; objectName: "Rect9" + id: rect9; objectName: "rect9" y: 50; width: 10; height: 10 anchors.left: parent.horizontalCenter } Rectangle { - id: Rect10; objectName: "Rect10" + id: rect10; objectName: "rect10" y: 60; width: 10; height: 10 anchors.right: parent.left } Rectangle { - id: Rect11; objectName: "Rect11" + id: rect11; objectName: "rect11" y: 60; width: 10; height: 10 anchors.right: parent.right } Rectangle { - id: Rect12; objectName: "Rect12" + id: rect12; objectName: "rect12" y: 60; width: 10; height: 10 anchors.right: parent.horizontalCenter } Rectangle { - id: Rect13; objectName: "Rect13" + id: rect13; objectName: "rect13" x: 200; width: 10; height: 10 - anchors.top: MasterRect.bottom + anchors.top: masterRect.bottom } Rectangle { - id: Rect14; objectName: "Rect14" + id: rect14; objectName: "rect14" width: 10; height: 10; color: "steelblue" anchors.verticalCenter: parent.verticalCenter } Rectangle { - id: Rect15; objectName: "Rect15" + id: rect15; objectName: "rect15" y: 200; height: 10 - anchors.left: MasterRect.left - anchors.right: MasterRect.right + anchors.left: masterRect.left + anchors.right: masterRect.right } Rectangle { - id: Rect16; objectName: "Rect16" + id: rect16; objectName: "rect16" y: 220; height: 10 - anchors.left: MasterRect.left - anchors.horizontalCenter: MasterRect.right + anchors.left: masterRect.left + anchors.horizontalCenter: masterRect.right } Rectangle { - id: Rect17; objectName: "Rect17" + id: rect17; objectName: "rect17" y: 240; height: 10 - anchors.right: MasterRect.right - anchors.horizontalCenter: MasterRect.left + anchors.right: masterRect.right + anchors.horizontalCenter: masterRect.left } Rectangle { - id: Rect18; objectName: "Rect18" + id: rect18; objectName: "rect18" x: 180; width: 10 - anchors.top: MasterRect.bottom + anchors.top: masterRect.bottom anchors.bottom: Rect12.top } Rectangle { - id: Rect19; objectName: "Rect19" + id: rect19; objectName: "rect19" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.horizontalCenter } Rectangle { - id: Rect20; objectName: "Rect20" + id: rect20; objectName: "rect20" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.right } Rectangle { - id: Rect21; objectName: "Rect21" + id: rect21; objectName: "rect21" y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.left } Rectangle { - id: Rect22; objectName: "Rect22" + id: rect22; objectName: "rect22" width: 10; height: 10 - anchors.centerIn: MasterRect + anchors.centerIn: masterRect } Rectangle { - id: Rect23; objectName: "Rect23" - anchors.left: MasterRect.left + id: rect23; objectName: "rect23" + anchors.left: masterRect.left anchors.leftMargin: 5 - anchors.right: MasterRect.right + anchors.right: masterRect.right anchors.rightMargin: 5 - anchors.top: MasterRect.top + anchors.top: masterRect.top anchors.topMargin: 5 - anchors.bottom: MasterRect.bottom + anchors.bottom: masterRect.bottom anchors.bottomMargin: 5 } Text { diff --git a/tests/auto/declarative/anchors/data/illegal1.qml b/tests/auto/declarative/anchors/data/illegal1.qml index 0a960d0..53af443 100644 --- a/tests/auto/declarative/anchors/data/illegal1.qml +++ b/tests/auto/declarative/anchors/data/illegal1.qml @@ -3,10 +3,10 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Rectangle { id: TheRect; width: 100; height: 100 } + Rectangle { id: theRect; width: 100; height: 100 } Rectangle { - anchors.left: TheRect.left - anchors.right: TheRect.right - anchors.horizontalCenter: TheRect.horizontalCenter + anchors.left: theRect.left + anchors.right: theRect.right + anchors.horizontalCenter: theRect.horizontalCenter } } diff --git a/tests/auto/declarative/anchors/data/illegal2.qml b/tests/auto/declarative/anchors/data/illegal2.qml index 2497738..978be52 100644 --- a/tests/auto/declarative/anchors/data/illegal2.qml +++ b/tests/auto/declarative/anchors/data/illegal2.qml @@ -3,11 +3,11 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Text { id: Text1; text: "Hello" } + Text { id: text1; text: "Hello" } Text { - id: Text2; - anchors.baseline: Text1.baseline; - anchors.top: Text1.top; + id: text2; + anchors.baseline: text1.baseline; + anchors.top: text1.top; text: "World" } } diff --git a/tests/auto/declarative/anchors/data/illegal3.qml b/tests/auto/declarative/anchors/data/illegal3.qml index 27b2e4d..065ceb5 100644 --- a/tests/auto/declarative/anchors/data/illegal3.qml +++ b/tests/auto/declarative/anchors/data/illegal3.qml @@ -4,9 +4,9 @@ Rectangle { id: rect width: 120; height: 200; color: "white" Item { - Rectangle { id: TheRect; width: 100; height: 100 } + Rectangle { id: theRect; width: 100; height: 100 } } Rectangle { - anchors.left: TheRect.left + anchors.left: theRect.left } } diff --git a/tests/auto/declarative/anchors/data/loop1.qml b/tests/auto/declarative/anchors/data/loop1.qml index ef6b63d..a266612 100644 --- a/tests/auto/declarative/anchors/data/loop1.qml +++ b/tests/auto/declarative/anchors/data/loop1.qml @@ -3,6 +3,6 @@ import Qt 4.6 Rectangle { id: rect width: 120; height: 200; color: "white" - Text { id: Text1; anchors.right: Text2.right; text: "Hello" } - Text { id: Text2; anchors.right: Text1.right; anchors.rightMargin: 10; text: "World" } + Text { id: text1; anchors.right: text2.right; text: "Hello" } + Text { id: text2; anchors.right: text1.right; anchors.rightMargin: 10; text: "World" } } diff --git a/tests/auto/declarative/anchors/data/loop2.qml b/tests/auto/declarative/anchors/data/loop2.qml index 2445a15..acb57cd 100644 --- a/tests/auto/declarative/anchors/data/loop2.qml +++ b/tests/auto/declarative/anchors/data/loop2.qml @@ -6,15 +6,15 @@ Rectangle { height: 600; Image { - id: Image1 + id: image1 source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg" - anchors.right: Image2.left + anchors.right: image2.left } Image { - id: Image2 + id: image2 source: "http://labs.trolltech.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg" - anchors.left: Image1.right + anchors.left: image1.right anchors.leftMargin: 20 } } diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index 4c85d2d..34c1e01 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -97,51 +97,51 @@ void tst_anchors::basicAnchors() qApp->processEvents(); //sibling horizontal - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect1"))->x(), 26.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect2"))->x(), 122.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect3"))->x(), 74.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect4"))->x(), 16.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect5"))->x(), 112.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect6"))->x(), 64.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect1"))->x(), 26.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect2"))->x(), 122.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect3"))->x(), 74.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect4"))->x(), 16.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect5"))->x(), 112.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect6"))->x(), 64.0); //parent horizontal - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect7"))->x(), 0.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect8"))->x(), 240.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect9"))->x(), 120.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect10"))->x(), -10.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect11"))->x(), 230.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect12"))->x(), 110.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect7"))->x(), 0.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect8"))->x(), 240.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect9"))->x(), 120.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect10"))->x(), -10.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect11"))->x(), 230.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect12"))->x(), 110.0); //vertical - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect13"))->y(), 20.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect14"))->y(), 155.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect13"))->y(), 20.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect14"))->y(), 155.0); //stretch - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect15"))->x(), 26.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect15"))->width(), 96.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect16"))->x(), 26.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect16"))->width(), 192.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect17"))->x(), -70.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect17"))->width(), 192.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect15"))->x(), 26.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect15"))->width(), 96.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect16"))->x(), 26.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect16"))->width(), 192.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect17"))->x(), -70.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect17"))->width(), 192.0); //vertical stretch - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect18"))->y(), 20.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect18"))->height(), 40.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect18"))->y(), 20.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect18"))->height(), 40.0); //more parent horizontal - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect19"))->x(), 115.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect20"))->x(), 235.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect21"))->x(), -5.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect19"))->x(), 115.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect20"))->x(), 235.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect21"))->x(), -5.0); //centerIn - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect22"))->x(), 69.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect22"))->y(), 5.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect22"))->x(), 69.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect22"))->y(), 5.0); //margins - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->x(), 31.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->y(), 5.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->width(), 86.0); - QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->height(), 10.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect23"))->x(), 31.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect23"))->y(), 5.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect23"))->width(), 86.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("rect23"))->height(), 10.0); //baseline QmlGraphicsText *text1 = findItem<QmlGraphicsText>(view->root(), QLatin1String("text1")); diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml index 2b4f55d..1a7366d 100644 --- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml +++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml @@ -5,7 +5,7 @@ Rectangle { width: 600; height: 300 ListModel { - id: List + id: list ListElement { dayColor: "steelblue" } ListElement { dayColor: "blue" } ListElement { dayColor: "yellow" } @@ -16,22 +16,22 @@ Rectangle { } Flickable { - id: Flick + id: flickable anchors.fill: parent; viewportWidth: row.width Row { id: row Repeater { - model: List + model: list Rectangle { width: 200; height: 300; color: dayColor } } } } Rectangle { radius: 3 - y: Flick.height-8 + y: flickable.height-8 height: 8 - x: Flick.visibleArea.xPosition * Flick.width - width: Flick.visibleArea.widthRatio * Flick.width + x: flickable.visibleArea.xPosition * flickable.width + width: flickable.visibleArea.widthRatio * flickable.width } } diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml index 0d6bbed..a1885c4 100644 --- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml +++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml @@ -5,7 +5,7 @@ Rectangle { width: 300; height: 600 ListModel { - id: List + id: list ListElement { dayColor: "steelblue" } ListElement { dayColor: "blue" } ListElement { dayColor: "yellow" } @@ -22,7 +22,7 @@ Rectangle { Column { id: column Repeater { - model: List + model: list Rectangle { width: 300; height: 200; color: dayColor } } } diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml index 3c9ea5b..fa6b5da 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml @@ -5,12 +5,12 @@ Rectangle { height: childrenRect.height Column { width: 80 - height: MyText.height*4 + height: myText.height*4 Text { elide: "ElideLeft" text: "aaa bbb ccc ddd eee fff" width: 80 - id: MyText + id: myText } Text { elide: "ElideMiddle" diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml index fa74cc4..081971c 100644 --- a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml @@ -5,12 +5,12 @@ Rectangle { height: 50 color: "lightBlue" Rectangle { - width: MyText.width - height: MyText.height + width: myText.width + height: myText.height color: "white" anchors.centerIn: parent Text { - id: MyText + id: myText width: NumberAnimation { from: 500; to: 0; running: true; repeat: true; duration: 1000 } elide: "ElideRight" text: "Brevity is the soul of wit, and tediousness the limbs and outward flourishes.\x9CBrevity is a great charm of eloquence.\x9CBe concise!\x9CSHHHHHHHHHHHHHHHHHHHHHHHHHHHH" diff --git a/tests/auto/declarative/visual/repeater/basic1.qml b/tests/auto/declarative/visual/repeater/basic1.qml index f6899e8..acb669c 100644 --- a/tests/auto/declarative/visual/repeater/basic1.qml +++ b/tests/auto/declarative/visual/repeater/basic1.qml @@ -4,7 +4,6 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page Row { Repeater { delegate: Rectangle { diff --git a/tests/auto/declarative/visual/repeater/basic2.qml b/tests/auto/declarative/visual/repeater/basic2.qml index 15a1e91..3323da5 100644 --- a/tests/auto/declarative/visual/repeater/basic2.qml +++ b/tests/auto/declarative/visual/repeater/basic2.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page Component { - id: Delegate + id: delegate Rectangle { color: "red" width: 100 @@ -18,7 +17,7 @@ Rectangle { } Row { Repeater { - delegate: Delegate + delegate: delegate model: ListModel { ListElement { name: "January" diff --git a/tests/auto/declarative/visual/repeater/basic3.qml b/tests/auto/declarative/visual/repeater/basic3.qml index 4680534..cb57d49 100644 --- a/tests/auto/declarative/visual/repeater/basic3.qml +++ b/tests/auto/declarative/visual/repeater/basic3.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page ListModel { - id: DataSource + id: dataSource ListElement { name: "January" } @@ -16,7 +15,7 @@ Rectangle { } Row { Repeater { - model: DataSource + model: dataSource delegate: Rectangle { color: "red" width: 100 diff --git a/tests/auto/declarative/visual/repeater/basic4.qml b/tests/auto/declarative/visual/repeater/basic4.qml index 6172493..f31de2c 100644 --- a/tests/auto/declarative/visual/repeater/basic4.qml +++ b/tests/auto/declarative/visual/repeater/basic4.qml @@ -4,9 +4,8 @@ Rectangle { color: "blue" width: 300 height: 200 - id: Page ListModel { - id: DataSource + id: dataSource ListElement { name: "January" } @@ -15,7 +14,7 @@ Rectangle { } } Component { - id: Delegate + id: delegate Rectangle { color: "red" width: 100 @@ -27,8 +26,8 @@ Rectangle { } Row { Repeater { - model: DataSource - delegate: Delegate + model: dataSource + delegate: delegate } } } diff --git a/tests/auto/declarative/visual/scriptAction/scriptAction.qml b/tests/auto/declarative/visual/scriptAction/scriptAction.qml index b1254e2..872701b 100644 --- a/tests/auto/declarative/visual/scriptAction/scriptAction.qml +++ b/tests/auto/declarative/visual/scriptAction/scriptAction.qml @@ -8,13 +8,13 @@ Rectangle { color: "red" } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } states: State { name: "state1" - when: Clickable.pressed + when: clickable.pressed PropertyChanges { target: myRect x: 50; y: 50 |