summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-03-08 15:52:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-12 05:26:21 +0100
commit0e905e91382ac5903c8784a28ed6b5a15adf404e (patch)
tree5356c4ce3dd42def56d63b140a92071994245419
parent16a1d5c81bfaf2103b8584d59f6bbd844fc67985 (diff)
Remove outdated assumption from QVariant autotest.
The test was assuming that "data()" is a special function in autotests, but that hasn't been the case since early prototypes of testlib. Change-Id: Ic24cf5dc539b55d12eba0a6ab17173e2ed698f21 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index d78759e923..655c714322 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -228,7 +228,7 @@ private slots:
void podUserType();
- void data_(); // data is virtual function in QtTestCase
+ void data();
void constData();
void saveLoadCustomTypes();
@@ -2221,7 +2221,7 @@ void tst_QVariant::basicUserType()
QCOMPARE(v.toByteArray(), QByteArray("bar"));
}
-void tst_QVariant::data_()
+void tst_QVariant::data()
{
QVariant v;