diff options
13 files changed, 24 insertions, 24 deletions
diff --git a/tests/auto/declarative/animations/data/badtype4.qml b/tests/auto/declarative/animations/data/badtype4.qml index b5096f4..a4cf265 100644 --- a/tests/auto/declarative/animations/data/badtype4.qml +++ b/tests/auto/declarative/animations/data/badtype4.qml @@ -6,7 +6,7 @@ Rectangle { height: 320 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "red" width: 50; height: 50 x: 100; y: 100 diff --git a/tests/auto/declarative/animations/data/mixedtype1.qml b/tests/auto/declarative/animations/data/mixedtype1.qml index a9eed24..87f4f16 100644 --- a/tests/auto/declarative/animations/data/mixedtype1.qml +++ b/tests/auto/declarative/animations/data/mixedtype1.qml @@ -6,7 +6,7 @@ Rectangle { height: 320 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "red" width: 50; height: 50 x: 100; y: 100 diff --git a/tests/auto/declarative/animations/data/mixedtype2.qml b/tests/auto/declarative/animations/data/mixedtype2.qml index 8acb825..d555abd 100644 --- a/tests/auto/declarative/animations/data/mixedtype2.qml +++ b/tests/auto/declarative/animations/data/mixedtype2.qml @@ -6,7 +6,7 @@ Rectangle { height: 320 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "red" width: 50; height: 50 x: 100; y: 100 diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml index dc4aee9..8d7dbbc 100644 --- a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml +++ b/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - property var myinput: input + property var myInput: input width: 800; height: 600; color: "blue" diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml b/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml index 06b57ea..103a627 100644 --- a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml +++ b/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - property var myinput: input + property var myInput: input width: 800; height: 600; color: "blue" diff --git a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp index 0ff5ff4..ab03713 100644 --- a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp +++ b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp @@ -627,9 +627,9 @@ void tst_qmlgraphicstextedit::cursorDelegate() void tst_qmlgraphicstextedit::delegateLoading() { TestHTTPServer server(42332); - server.serveDirectory("data/httpfail", TestHTTPServer::Disconnect); - server.serveDirectory("data/httpslow", TestHTTPServer::Delay); - server.serveDirectory("data/http"); + server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect); + server.serveDirectory(SRCDIR "/data/httpslow", TestHTTPServer::Delay); + server.serveDirectory(SRCDIR "/data/http"); QmlView* view = new QmlView(0); view->setUrl(QUrl("http://localhost:42332/cursorHttpTestPass.qml")); view->execute(); diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml index 637de3a..7a2e914 100644 --- a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml +++ b/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - property var myinput: input + property var myInput: input width: 800; height: 600; color: "blue" @@ -10,7 +10,7 @@ Rectangle { KeyNavigation.right: input } - Textinput { id: input; focus: true + TextInput { id: input; focus: true KeyNavigation.left: firstItem KeyNavigation.right: lastItem KeyNavigation.up: firstItem diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml b/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml index 886da0c..c47371a 100644 --- a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml +++ b/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml @@ -1,11 +1,11 @@ import Qt 4.6 Rectangle { - property var myinput: input + property var myInput: input width: 800; height: 600; color: "blue" - Textinput { id: input; focus: true + TextInput { id: input; focus: true readOnly: true text: "I am the very model of a modern major general.\n" } diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 54442d5..606d4c6 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -51,7 +51,7 @@ #include "../../../shared/util.h" /* -This test case covers QML language issues. This covers everything that does +This test case covers QML language issues. This covers everything that does not involve evaluating ECMAScript expressions and bindings. Evaluation of expressions and bindings is covered in qmlecmascript @@ -141,7 +141,7 @@ private: QVERIFY(!component.isError()); \ QVERIFY(component.errors().isEmpty()); \ } else { \ - QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \ + QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \ QVERIFY(file.open(QIODevice::ReadOnly)); \ QByteArray data = file.readAll(); \ file.close(); \ diff --git a/tests/auto/declarative/states/data/anchorChanges2.qml b/tests/auto/declarative/states/data/anchorChanges2.qml index 516ed58..545345e 100644 --- a/tests/auto/declarative/states/data/anchorChanges2.qml +++ b/tests/auto/declarative/states/data/anchorChanges2.qml @@ -4,7 +4,7 @@ Rectangle { width: 200; height: 200 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" width: 50; height: 50 color: "green"; anchors.left: parent.left diff --git a/tests/auto/declarative/states/data/anchorChanges3.qml b/tests/auto/declarative/states/data/anchorChanges3.qml index e19bd9a..9d5b317 100644 --- a/tests/auto/declarative/states/data/anchorChanges3.qml +++ b/tests/auto/declarative/states/data/anchorChanges3.qml @@ -5,17 +5,17 @@ Rectangle { width: 200; height: 200 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "green"; anchors.left: parent.left anchors.right: rightGuideline.left anchors.top: topGuideline.top anchors.bottom: container.bottom } - Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } + Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 } Item { id: rightGuideline; x: 150 } Item { id: topGuideline; y: 10 } - Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } + Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { diff --git a/tests/auto/declarative/states/data/anchorChanges4.qml b/tests/auto/declarative/states/data/anchorChanges4.qml index b766c71..f128989 100644 --- a/tests/auto/declarative/states/data/anchorChanges4.qml +++ b/tests/auto/declarative/states/data/anchorChanges4.qml @@ -4,13 +4,13 @@ Rectangle { width: 200; height: 200 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "green"; anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter } - Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } - Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } + Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 } + Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { diff --git a/tests/auto/declarative/states/data/anchorChanges5.qml b/tests/auto/declarative/states/data/anchorChanges5.qml index 2d4b3c0..4e6d34b 100644 --- a/tests/auto/declarative/states/data/anchorChanges5.qml +++ b/tests/auto/declarative/states/data/anchorChanges5.qml @@ -4,13 +4,13 @@ Rectangle { width: 200; height: 200 Rectangle { id: myRect - objectName: "myRect" + objectName: "MyRect" color: "green"; anchors.horizontalCenter: parent.horizontalCenter anchors.baseline: parent.baseline } - Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } - Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } + Item { objectName: "LeftGuideline"; id: leftGuideline; x: 10 } + Item { objectName: "BottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { |