summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp4
-rw-r--r--tests/auto/declarative/states/data/anchorChanges2.qml2
-rw-r--r--tests/auto/declarative/states/data/anchorChanges3.qml6
-rw-r--r--tests/auto/declarative/states/data/anchorChanges4.qml6
-rw-r--r--tests/auto/declarative/states/data/anchorChanges5.qml6
5 files changed, 12 insertions, 12 deletions
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 {