diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
| commit | 720431716a8af66d1be73a1c9462ef12af831c90 (patch) | |
| tree | c54a9e61a4507247de404046338d38ca2828540e /tests/auto/declarative | |
| parent | 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a (diff) | |
| parent | 9aac83d22ddbebc22fb1360d710263d349c2fdda (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/data/darker.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/data/lighter.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml index d2ef866d..cbd129dd 100644 --- a/tests/auto/declarative/qdeclarativeqt/data/darker.qml +++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml @@ -5,7 +5,7 @@ QtObject { property variant test2: Qt.darker() property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8) property variant test4: Qt.darker("red"); - property variant test5: Qt.darker("perfectred"); // Non-existant color + property variant test5: Qt.darker("perfectred"); // Non-existent color property variant test6: Qt.darker(10); property variant test7: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8, 10) } diff --git a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml index 67f0d0f3..34f6b273 100644 --- a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml +++ b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml @@ -5,7 +5,7 @@ QtObject { property variant test2: Qt.lighter() property variant test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8) property variant test4: Qt.lighter("red"); - property variant test5: Qt.lighter("perfectred"); // Non-existant color + property variant test5: Qt.lighter("perfectred"); // Non-existent color property variant test6: Qt.lighter(10); property variant test7: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8, 5) } |