diff options
Diffstat (limited to 'tests/auto/declarative/qmlvisual')
17 files changed, 45 insertions, 45 deletions
diff --git a/tests/auto/declarative/qmlvisual/ListView/basic1.qml b/tests/auto/declarative/qmlvisual/ListView/basic1.qml index 8c1b56e5..78611379 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic1.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic1.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } model: ListModel { diff --git a/tests/auto/declarative/qmlvisual/ListView/basic2.qml b/tests/auto/declarative/qmlvisual/ListView/basic2.qml index 9d26c737..ece8aafb 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic2.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic2.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/ListView/basic3.qml b/tests/auto/declarative/qmlvisual/ListView/basic3.qml index 982df9a6..cb5b8f71 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic3.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic3.qml @@ -25,7 +25,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/ListView/basic4.qml b/tests/auto/declarative/qmlvisual/ListView/basic4.qml index 2c5d1e3e..837d9b77 100644 --- a/tests/auto/declarative/qmlvisual/ListView/basic4.qml +++ b/tests/auto/declarative/qmlvisual/ListView/basic4.qml @@ -24,7 +24,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/focusscope/test.qml b/tests/auto/declarative/qmlvisual/focusscope/test.qml index 7342e353..36a6c471 100644 --- a/tests/auto/declarative/qmlvisual/focusscope/test.qml +++ b/tests/auto/declarative/qmlvisual/focusscope/test.qml @@ -19,7 +19,7 @@ Rectangle { focus: true Keys.onDigit9Pressed: console.log("Error - FocusScope") - + Rectangle { height: 120 width: 420 @@ -30,13 +30,13 @@ Rectangle { Rectangle { id: item1 - x: 10; y: 10 + x: 10; y: 10 width: 100; height: 100; color: "green" border.width: 5 border.color: activeFocus?"blue":"black" Keys.onDigit9Pressed: console.log("Top Left"); KeyNavigation.right: item2 - focus: true + focus: true Rectangle { width: 50; height: 50; anchors.centerIn: parent diff --git a/tests/auto/declarative/qmlvisual/focusscope/test3.qml b/tests/auto/declarative/qmlvisual/focusscope/test3.qml index 90c23573..377b03a5 100644 --- a/tests/auto/declarative/qmlvisual/focusscope/test3.qml +++ b/tests/auto/declarative/qmlvisual/focusscope/test3.qml @@ -27,12 +27,12 @@ Rectangle { id: verticalDelegate FocusScope { id: root - width: 50; height: 50; + width: 50; height: 50; Keys.onDigit9Pressed: console.log("Error - " + name) - Rectangle { + Rectangle { focus: true Keys.onDigit9Pressed: console.log(name) - width: 50; height: 50; + width: 50; height: 50; color: root.ListView.isCurrentItem?"black":name } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml index 9335b9e3..ff06c7e1 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/flickable-nested.qml @@ -14,7 +14,7 @@ Item { width: 300 height: 300 color: "blue" - + Flickable { objectName: "flick 2" width: 300 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml index 31712034..252d3636 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview-2.qml @@ -3,7 +3,7 @@ import QtQuick 1.0 Rectangle { width: 580; height: 220 //Same as test-pathview, but with pathItemCount < model.count - + ListModel { id: rssModel ListElement { lColor: "red" } @@ -24,7 +24,7 @@ Rectangle { scale: wrapper.PathView.scale MouseArea { anchors.fill: parent } - + transform: Rotation { id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle @@ -39,25 +39,25 @@ Rectangle { pathItemCount: 6 path: Path { startX: -50; startY: 40; - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: -45 } - + PathCubic { x: 300; y: 140 control1X: 90; control1Y: 30 control2X: 140; control2Y: 150 } - + PathAttribute { name: "scale"; value: 1.2 } PathAttribute { name: "angle"; value: 0 } - + PathCubic { x: 600; y: 30 control2X: 440; control2Y: 30 control1X: 420; control1Y: 150 } - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: 45 } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml index 08499e76..25616049 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 Rectangle { width: 580; height: 220 - + ListModel { id: rssModel ListElement { lColor: "red" } @@ -23,7 +23,7 @@ Rectangle { scale: wrapper.PathView.scale MouseArea { anchors.fill: parent } - + transform: Rotation { id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 axis.y: 1; axis.z: 0; angle: wrapper.PathView.angle @@ -39,25 +39,25 @@ Rectangle { flickDeceleration: 200 path: Path { startX: -50; startY: 40; - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: -45 } - + PathCubic { x: 300; y: 140 control1X: 90; control1Y: 30 control2X: 140; control2Y: 150 } - + PathAttribute { name: "scale"; value: 1.2 } PathAttribute { name: "angle"; value: 0 } - + PathCubic { x: 600; y: 30 control2X: 440; control2Y: 30 control1X: 420; control1Y: 150 } - + PathAttribute { name: "scale"; value: 0.5 } PathAttribute { name: "angle"; value: 45 } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml index b5685d1a..e6caf6eb 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/dynamic.qml @@ -42,9 +42,9 @@ Item { id: row2 height: childrenRect.height move: Transition{NumberAnimation{properties:"x"}} - Repeater{ - id: repeater - model: 0; + Repeater{ + id: repeater + model: 0; delegate: Component{ Rectangle { color: "yellow"; width:20; height:20;}} } Rectangle{id: r2a; width:20; height:20; color: "red"} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml index 17709ba9..3e2213a9 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml @@ -6,7 +6,7 @@ Item { property alias text: textEdit.text width: 240 + 11 //Should be set manually in most cases - height: textEdit.height + 11 + height: textEdit.height + 11 Rectangle { color: 'lightsteelblue' @@ -25,10 +25,10 @@ Item { y: 1 } } - property int leftMargin: 6 - property int topMargin: 6 - property int rightMargin: 6 - property int bottomMargin: 6 + property int leftMargin: 6 + property int topMargin: 6 + property int rightMargin: 6 + property int bottomMargin: 6 x: leftMargin width: parent.width - leftMargin - rightMargin; y: 5 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml index 6789eac2..4218d442 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml @@ -5,8 +5,8 @@ Item { id:lineedit property alias text: textInp.text - width: textInp.width + 11 - height: 13 + 11 + width: textInp.width + 11 + height: 13 + 11 Rectangle { color: 'lightsteelblue' @@ -25,8 +25,8 @@ Item { y: 1 } } - property int leftMargin: 6 - property int rightMargin: 6 + property int leftMargin: 6 + property int rightMargin: 6 x: leftMargin y: 5 //Below function implements all scrolling logic diff --git a/tests/auto/declarative/qmlvisual/repeater/basic1.qml b/tests/auto/declarative/qmlvisual/repeater/basic1.qml index 5d994b96..bf11a42a 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic1.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic1.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } model: ListModel { diff --git a/tests/auto/declarative/qmlvisual/repeater/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/basic2.qml index ea14e92e..0a7d4d7f 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic2.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic2.qml @@ -15,7 +15,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/repeater/basic3.qml b/tests/auto/declarative/qmlvisual/repeater/basic3.qml index 0193db30..7052b23e 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic3.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic3.qml @@ -25,7 +25,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/repeater/basic4.qml b/tests/auto/declarative/qmlvisual/repeater/basic4.qml index c7c0d296..4f45d013 100644 --- a/tests/auto/declarative/qmlvisual/repeater/basic4.qml +++ b/tests/auto/declarative/qmlvisual/repeater/basic4.qml @@ -24,7 +24,7 @@ Rectangle { anchors.centerIn: parent width: 60 height: 60 - color: name + color: name } } } diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index 14a09d96..2802f9bb 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -178,7 +178,7 @@ QString tst_qmlvisual::toTestScript(const QString &file, Mode mode) platformsuffix = "-X11"; #endif - QString testdata = file.left(index + 1) + + QString testdata = file.left(index + 1) + QString("data"); QString testname = file.mid(index + 1, file.length() - index - 5); @@ -216,7 +216,7 @@ QStringList tst_qmlvisual::findQmlFiles(const QDir &d) { QStringList rv; - QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), + QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), QDir::Files); foreach (const QString &file, files) { if (file.at(0).isLower()) { @@ -224,7 +224,7 @@ QStringList tst_qmlvisual::findQmlFiles(const QDir &d) } } - QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | + QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); foreach (const QString &dir, dirs) { if (dir.left(4) == "data") @@ -389,7 +389,7 @@ int main(int argc, char **argv) } else { newArgv[newArgc++] = argv[ii]; } - + if (arg == "-help" || arg == "-?" || arg == "--help") { atexit(usage); showHelp = true; |