4 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/declarative/tst_place.qml b/tests/auto/declarative/tst_place.qml
index 38fe433f..56b87c5b 100644
--- a/tests/auto/declarative/tst_place.qml
+++ b/tests/auto/declarative/tst_place.qml
@@ -96,7 +96,7 @@ TestCase {
         }
 
         ratings: Ratings {
-            value: 3.5
+            average: 3.5
             count: 10
         }
 
@@ -198,7 +198,7 @@ TestCase {
         if (place1.ratings !== null && place2.ratings === null)
             return false;
         if (place1.ratings !== null && place2.ratings !== null) {
-            if (place1.ratings.value !== place2.ratings.value)
+            if (place1.ratings.average !== place2.ratings.average)
                 return false;
             if (place1.ratings.count !== place2.ratings.count)
                 return false;
@@ -276,7 +276,7 @@ TestCase {
         compare(emptyPlace.visibility, Place.UnspecifiedVisibility);
 
         // complex properties
-        compare(emptyPlace.ratings.value, 0);
+        compare(emptyPlace.ratings.average, 0);
         compare(emptyPlace.location.address.street, '');
         compare(emptyPlace.location.address.district, '');
         compare(emptyPlace.location.address.city, '');
@@ -428,19 +428,19 @@ TestCase {
     }
 
     function test_ratings() {
-        var ratings = Qt.createQmlObject('import QtLocation 5.0; Ratings { value: 3; count: 100 }', testCase, "Rating1");
+        var ratings = Qt.createQmlObject('import QtLocation 5.0; Ratings { average: 3; count: 100 }', testCase, "Rating1");
 
         var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy");
         signalSpy.target = testPlace;
         signalSpy.signalName = "ratingsChanged";
 
         testPlace.ratings = ratings;
-        compare(testPlace.ratings.value, 3);
+        compare(testPlace.ratings.average, 3);
         compare(testPlace.ratings.count, 100);
         compare(signalSpy.count, 1);
 
         testPlace.ratings = ratings;
-        compare(testPlace.ratings.value, 3);
+        compare(testPlace.ratings.average, 3);
         compare(testPlace.ratings.count, 100);
         compare(signalSpy.count, 1);
 
diff --git a/tests/auto/qmlinterface/data/TestRatings.qml b/tests/auto/qmlinterface/data/TestRatings.qml
index 7df9c971..c81f6fa1 100644
--- a/tests/auto/qmlinterface/data/TestRatings.qml
+++ b/tests/auto/qmlinterface/data/TestRatings.qml
@@ -42,7 +42,7 @@
 import QtLocation 5.0
 
 Ratings {
-    value: 3.5
+    average: 3.5
     maximum: 5.0
     count: 10
 }
diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp
index 5034f007..467a485a 100644
--- a/tests/auto/qmlinterface/tst_qmlinterface.cpp
+++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp
@@ -124,7 +124,7 @@ tst_qmlinterface::tst_qmlinterface()
 
     m_icon.setFullUrl(QUrl(QLatin1String("http://www.example.com/test-icon.png")));
 
-    m_ratings.setValue(3.5);
+    m_ratings.setAverage(3.5);
     m_ratings.setMaximum(5.0);
     m_ratings.setCount(10);
 
diff --git a/tests/auto/qplaceratings/tst_qplaceratings.cpp b/tests/auto/qplaceratings/tst_qplaceratings.cpp
index f7f5a121..fc0db503 100644
--- a/tests/auto/qplaceratings/tst_qplaceratings.cpp
+++ b/tests/auto/qplaceratings/tst_qplaceratings.cpp
@@ -55,7 +55,7 @@ public:
 
 private Q_SLOTS:
     void constructorTest();
-    void valueTest();
+    void averageTest();
     void countTest();
     void operatorsTest();
 };
@@ -72,17 +72,17 @@ void tst_QPlaceRatings::constructorTest()
     QPlaceRatings *testObjPtr = new QPlaceRatings(testObj);
     QVERIFY2(testObjPtr != NULL, "Copy constructor - null");
     QVERIFY2(testObjPtr->count() == 0, "Copy constructor - wrong count");
-    QVERIFY2(testObjPtr->value() == 0, "Copy constructor - wrong value");
+    QVERIFY2(testObjPtr->average() == 0, "Copy constructor - wrong average");
     QVERIFY2(*testObjPtr == testObj, "Copy constructor - compare");
     delete testObjPtr;
 }
 
-void tst_QPlaceRatings::valueTest()
+void tst_QPlaceRatings::averageTest()
 {
     QPlaceRatings testObj;
-    QVERIFY2(testObj.value() == 0, "Wrong default value");
-    testObj.setValue(-10.23);
-    QVERIFY2(testObj.value() == -10.23, "Wrong value returned");
+    QVERIFY2(qFuzzyCompare(testObj.average(), 0) , "Wrong default average");
+    testObj.setAverage(-10.23);
+    QVERIFY2(qFuzzyCompare(testObj.average(), -10.23), "Wrong average returned");
 }
 
 void tst_QPlaceRatings::countTest()
@@ -96,7 +96,7 @@ void tst_QPlaceRatings::countTest()
 void tst_QPlaceRatings::operatorsTest()
 {
     QPlaceRatings testObj;
-    testObj.setValue(0.123);
+    testObj.setAverage(0.123);
     QPlaceRatings testObj2;
     testObj2 = testObj;
     QVERIFY2(testObj == testObj2, "Not copied correctly");