summaryrefslogtreecommitdiffstats
path: root/tests/auto/qvariant
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-16 00:25:03 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-16 22:57:14 (GMT)
commit48f4fe4897ba6b98434993179b47d6d9491ae173 (patch)
tree536600f270c4e3dd75fd5640f5f32fb8cfe5904b /tests/auto/qvariant
parentb7406af04ec83b3e8d712b42a87f6c29121b998d (diff)
downloadQt-48f4fe4897ba6b98434993179b47d6d9491ae173.zip
Qt-48f4fe4897ba6b98434993179b47d6d9491ae173.tar.gz
Qt-48f4fe4897ba6b98434993179b47d6d9491ae173.tar.bz2
Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespace
Diffstat (limited to 'tests/auto/qvariant')
-rw-r--r--tests/auto/qvariant/tst_qvariant.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 21b2fe3..a316dda 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -3200,7 +3200,10 @@ struct MyPrimitive
return x == o.x && y == o.y;
}
};
+
+QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+QT_END_NAMESPACE
struct MyData
{
@@ -3239,7 +3242,9 @@ struct MyMovable
int MyMovable::count = 0;
+QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
Q_DECLARE_METATYPE(QList<QSize>)
Q_DECLARE_METATYPE(MyPrimitive)