diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-08-29 20:27:07 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-12 23:35:29 +0200 |
commit | 14dece57e9d63fe4a1be5e8a1fc1816c4a9b7fe6 (patch) | |
tree | 565872857a0f6a5b41f39400725aee86d83fa302 /tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | |
parent | 7d1a74d36d04b056a067bb2318373cbc132416e4 (diff) |
Remap QMetaType ids to create more space for builtin types
We were starting to run out of space for builtin core types.
Remap the type id's to create lots of additional space.
We now reserve the first 64k id's for Qt, and have 16k id's for
Qt Core. That should hopfully be enough for a while ;-)
Fixes: QTBUG-85914
Change-Id: I0dab6bf23652e46a9557d9b38af7990b68c572b6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index b0e622e440..a6c0ecb012 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -2782,7 +2782,7 @@ void tst_QVariant::loadUnknownUserType() qRegisterMetaType<MyClass>("MyClass"); QTest::ignoreMessage(QtWarningMsg, "QVariant::load: unable to load type " + QByteArray::number(qMetaTypeId<MyClass>()) +"."); - char data[] = {0, 0, QMetaType::User >> 8 , char(QMetaType::User), 0, 0, 0, 0, 8, 'M', 'y', 'C', 'l', 'a', 's', 's', 0}; + char data[] = {0, QMetaType::User >> 16, char(QMetaType::User >> 8) , char(QMetaType::User), 0, 0, 0, 0, 8, 'M', 'y', 'C', 'l', 'a', 's', 's', 0}; QByteArray ba(data, sizeof(data)); QDataStream ds(&ba, QIODevice::ReadOnly); |