From 7ffa961eb6a4861da6fa5bde19f5ae7daef05063 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 11 Jan 2010 17:06:25 +1000
Subject: unwarn

---
 tests/auto/declarative/qmllanguage/testtypes.cpp | 8 ++++++++
 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
-- 
cgit v0.12