From 6ebb870eab29388b2c668c5b7571465dede10808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 2 Dec 2014 18:07:41 +0200 Subject: Change test data from 6.7 to 6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applying QtDeclarative's, 205336ebc859e670a4d06524ce65a22befc0eab4 to QtQuick1. Change-Id: I285b35cbc727e847c45dab22e232640d9faaac21 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml | 2 +- .../declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml index 58b7adb8..7fe2cc30 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml @@ -40,7 +40,7 @@ QtObject { property int d: 176 property string e: "Hello" property string f: "World" - property variant g: 6.7 + property variant g: 6.5 property variant h: "!" property variant i: true property string j: "#112233" diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 9eef4c74..549726f4 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -2309,8 +2309,8 @@ void tst_qdeclarativeecmascript::compiled() QCOMPARE(object->property("test17").toInt(), 5); QCOMPARE(object->property("test18").toReal(), qreal(176)); QCOMPARE(object->property("test19").toInt(), 7); - QCOMPARE(object->property("test20").toReal(), qreal(6.7)); - QCOMPARE(object->property("test21").toString(), QLatin1String("6.7")); + QCOMPARE(object->property("test20").toReal(), qreal(6.5)); + QCOMPARE(object->property("test21").toString(), QLatin1String("6.5")); QCOMPARE(object->property("test22").toString(), QLatin1String("!")); QCOMPARE(object->property("test23").toBool(), true); QCOMPARE(qvariant_cast(object->property("test24")), QColor(0x11,0x22,0x33)); -- cgit v1.2.3