diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
commit | 840dab97ee4bd68dcf75cfd2edd5e58c38040ae1 (patch) | |
tree | 04270ec3cad3bfb3d2cb48f6c6455b49aee02b53 /tests/auto/declarative/qmlnumberformatter | |
parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
download | Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.zip Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.gz Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.bz2 |
Merge remote branch 'origin/master' into mobility-master
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'tests/auto/declarative/qmlnumberformatter')
-rw-r--r-- | tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp b/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp index bf71625..30f2fea 100644 --- a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp +++ b/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -45,12 +45,12 @@ #include <private/qnumberformat_p.h> #include <private/qmlnumberformatter_p.h> -class tst_numberformat : public QObject +class tst_qmlnumberformatter : public QObject { Q_OBJECT public: - tst_numberformat(); - + tst_qmlnumberformatter(); + void init() {} void initTestCase() {} @@ -67,7 +67,7 @@ private: QStringList texts; }; -tst_numberformat::tst_numberformat() +tst_qmlnumberformatter::tst_qmlnumberformatter() { strings << "100.0" << "12345" @@ -177,7 +177,7 @@ tst_numberformat::tst_numberformat() << "texts.size()" << texts.size(); } -void tst_numberformat::text_data() +void tst_qmlnumberformatter::text_data() { QTest::addColumn<QString>("string"); QTest::addColumn<QString>("format"); @@ -194,7 +194,7 @@ void tst_numberformat::text_data() } -void tst_numberformat::text() +void tst_qmlnumberformatter::text() { QFETCH(QString, string); QFETCH(QString, format); @@ -217,6 +217,6 @@ void tst_numberformat::text() delete formatter; } -QTEST_MAIN(tst_numberformat) +QTEST_MAIN(tst_qmlnumberformatter) #include "tst_qmlnumberformatter.moc" |