From 7ffa961eb6a4861da6fa5bde19f5ae7daef05063 Mon Sep 17 00:00:00 2001 From: Warwick Allison 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 #include +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 From 468027128f8019f8e49293ce561736e73e8785a0 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Mon, 11 Jan 2010 17:18:12 +1000 Subject: Ignore anchor loop duplicate error. --- tests/auto/declarative/anchors/tst_anchors.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index 90a90fe..4a51861 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -375,6 +375,7 @@ void tst_anchors::crash1() QString expect = "QML Text (" + view->url().toString() + ":4:5" + ") Possible anchor loop detected on fill."; QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); + QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message view->execute(); qApp->processEvents(); -- cgit v0.12