diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp | 22 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativevaluetypes/testtypes.h | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp index 4d07a19..a7e9d0d 100644 --- a/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp +++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp @@ -168,7 +168,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), -1); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -256,7 +256,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), -1); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -305,7 +305,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -357,7 +357,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), -1); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -406,7 +406,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -454,7 +454,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string() QVERIFY(expression != 0); QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -506,7 +506,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), -1); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -555,7 +555,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_context() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -607,7 +607,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), -1); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -656,7 +656,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context() QVERIFY(QDeclarativeMetaPropertyPrivate::setSignalExpression(prop, expression) == 0); QVERIFY(expression == 0); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } @@ -704,7 +704,7 @@ void tst_qdeclarativemetaproperty::qmlmetaproperty_object_string_context() QVERIFY(expression != 0); QVERIFY(QDeclarativeMetaPropertyPrivate::signalExpression(prop) == expression); QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()")); - QCOMPARE(prop.valueTypeCoreIndex(), -1); + QCOMPARE(QDeclarativeMetaPropertyPrivate::valueTypeCoreIndex(prop), -1); delete obj; } diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index 8b80e16..82a9c8a 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -53,6 +53,7 @@ #include <qdeclarative.h> #include <QDeclarativePropertyValueSource> #include <QDeclarativeMetaProperty> +#include <private/qdeclarativemetaproperty_p.h> class MyTypeObject : public QObject { @@ -143,7 +144,7 @@ class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValu Q_OBJECT public: virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; } - virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QDeclarativeMetaProperty::BypassInterceptor); } + virtual void write(const QVariant &value) { QDeclarativeMetaPropertyPrivate::write(prop, value.toInt() + 13, QDeclarativeMetaPropertyPrivate::BypassInterceptor); } private: QDeclarativeMetaProperty prop; |