diff options
8 files changed, 12 insertions, 12 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" } |