Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

2 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index 5c6ceef..fdcb98a 100644
--- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -547,10 +547,10 @@ void tst_qdeclarativelistreference::engineTypes()
     QVERIFY(o);
 
     QDeclarativeMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyCategory() == QDeclarativeMetaProperty::Normal);
+    QVERIFY(p1.propertyTypeCategory() == QDeclarativeMetaProperty::Normal);
 
     QDeclarativeMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyCategory() == QDeclarativeMetaProperty::List);
+    QVERIFY(p2.propertyTypeCategory() == QDeclarativeMetaProperty::List);
     QVariant v = p2.read();
     QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
     QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index be2aede..f2ed341 100644
--- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -157,7 +157,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty()
     QCOMPARE(prop.isResettable(), false);
     QCOMPARE(prop.isValid(), false);
     QCOMPARE(prop.object(), (QObject *)0);
-    QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+    QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
     QCOMPARE(prop.propertyType(), 0);
     QCOMPARE(prop.propertyTypeName(), (const char *)0);
     QVERIFY(prop.property().name() == 0);
@@ -251,7 +251,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -298,7 +298,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -352,7 +352,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -399,7 +399,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -448,7 +448,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -549,7 +549,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -596,7 +596,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -650,7 +650,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -697,7 +697,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -746,7 +746,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyTypeCategory(), QDeclarativeMetaProperty::InvalidCategory);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -1288,14 +1288,14 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(property->name(), QString("defaultProperty"));
     QCOMPARE(property->read(), QVariant(10));
     QCOMPARE(property->type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(property->propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(property->propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(property->propertyType(), (int)QVariant::Int);
 
     QDeclarativeMetaProperty p1(*property);
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
     QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
     QDeclarativeMetaProperty p2(&object, QLatin1String("url"));
@@ -1304,7 +1304,7 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
     QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 
     delete property; property = 0;
@@ -1312,13 +1312,13 @@ void tst_qdeclarativemetaproperty::copy()
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
     QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p1.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
     QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
+    QCOMPARE(p2.propertyTypeCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 }