AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Q_DECLARE_METATYPE macro

Browse Source 
The macro should stringify value of the given token not the token
itself.

Task-number: QTBUG-37547
Change-Id: I90f4fa613bd13d5a581828ab13f620b40dfd3593
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Jędrzej Nowacki 2014-03-17 09:38:39 +01:00 committed by The Qt Project
parent 8212e0cfad
commit ac178eae4e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qmetatype.h
View File

@ -1706,7 +1706,8 @@ inline int qRegisterMetaTypeStreamOperators()
} QT_END_NAMESPACE \ } QT_END_NAMESPACE \
/**/ /**/
#define Q_DECLARE_METATYPE(TYPE) \ #define Q_DECLARE_METATYPE(TYPE) Q_DECLARE_METATYPE_IMPL(TYPE)
#define Q_DECLARE_METATYPE_IMPL(TYPE) \
QT_BEGIN_NAMESPACE \ QT_BEGIN_NAMESPACE \
template <> \ template <> \
struct QMetaTypeId< TYPE > \ struct QMetaTypeId< TYPE > \

8
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
View File

@ -278,15 +278,21 @@ void tst_QMetaType::threadSafety()
namespace TestSpace namespace TestSpace
{ {
struct Foo { double d; }; struct Foo { double d; };
struct QungTfu {};
} }
Q_DECLARE_METATYPE(TestSpace::Foo) Q_DECLARE_METATYPE(TestSpace::Foo)
#define ADD_TESTSPACE(F) TestSpace::F
Q_DECLARE_METATYPE(ADD_TESTSPACE(QungTfu))
void tst_QMetaType::namespaces() void tst_QMetaType::namespaces()
{ {
TestSpace::Foo nf = { 11.12 }; TestSpace::Foo nf = { 11.12 };
QVariant v = QVariant::fromValue(nf); QVariant v = QVariant::fromValue(nf);
QCOMPARE(qvariant_cast<TestSpace::Foo>(v).d, 11.12); QCOMPARE(qvariant_cast<TestSpace::Foo>(v).d, 11.12);
int qungTfuId = qRegisterMetaType<ADD_TESTSPACE(QungTfu)>();
QCOMPARE(QMetaType::typeName(qungTfuId), "TestSpace::QungTfu");
} }
void tst_QMetaType::qMetaTypeId() void tst_QMetaType::qMetaTypeId()