diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 07:06:25 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 07:06:25 (GMT) |
commit | 7ffa961eb6a4861da6fa5bde19f5ae7daef05063 (patch) | |
tree | c0787fda35836db6848683379c5930fd769eba1c /tests | |
parent | b90d963ca4a021796188a8d1629e600c47a90fba (diff) | |
download | Qt-7ffa961eb6a4861da6fa5bde19f5ae7daef05063.zip Qt-7ffa961eb6a4861da6fa5bde19f5ae7daef05063.tar.gz Qt-7ffa961eb6a4861da6fa5bde19f5ae7daef05063.tar.bz2 |
unwarn
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qmllanguage/testtypes.cpp | 8 | ||||
-rw-r--r-- | tests/auto/declarative/qmllanguage/testtypes.h | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmllanguage/testtypes.cpp b/tests/auto/declarative/qmllanguage/testtypes.cpp index 933431d..f30f47e 100644 --- a/tests/auto/declarative/qmllanguage/testtypes.cpp +++ b/tests/auto/declarative/qmllanguage/testtypes.cpp @@ -49,3 +49,11 @@ QML_DEFINE_TYPE(Test,1,0,MyDotPropertyObject,MyDotPropertyObject); QML_DEFINE_TYPE(Test,1,0,MyNamespacedType,MyNamespace::MyNamespacedType); QML_DEFINE_TYPE(Test,1,0,MySecondNamespacedType,MyNamespace::MySecondNamespacedType); QML_DEFINE_NOCREATE_TYPE(MyGroupedObject); + +QVariant myCustomVariantTypeConverter(const QString &data) +{ + MyCustomVariantType rv; + rv.a = data.toInt(); + return QVariant::fromValue(rv); +} + diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h index 3598d68..0f2cdf9 100644 --- a/tests/auto/declarative/qmllanguage/testtypes.h +++ b/tests/auto/declarative/qmllanguage/testtypes.h @@ -53,6 +53,8 @@ #include <QtDeclarative/qmlpropertyvaluesource.h> #include <QtDeclarative/qmlscriptstring.h> +QVariant myCustomVariantTypeConverter(const QString &data); + class MyInterface { public: @@ -69,13 +71,6 @@ struct MyCustomVariantType }; Q_DECLARE_METATYPE(MyCustomVariantType); -static QVariant myCustomVariantTypeConverter(const QString &data) -{ - MyCustomVariantType rv; - rv.a = data.toInt(); - return QVariant::fromValue(rv); -} - class MyAttachedObject : public QObject { Q_OBJECT |