summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization/qjsonparser.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2024-10-08 08:54:11 -0700
committerThiago Macieira <thiago.macieira@intel.com>2024-11-22 11:09:23 -0800
commit6acacb36ddacc69e531b5c562616b68740e61042 (patch)
treedc50dbd290c4c17498e93edab193321689976ae3 /src/corelib/serialization/qjsonparser.cpp
parenta07996463814b0023f85958221d184095fca5264 (diff)
moc: move the StringData creation into qt_create_metaobjectdata()
This removes the last file-scope static variable by moving the stringdata into a merged MetaObjectContents resulting structure. We now only have two class-scope private static inline member template variables. It also removes the wish to merge the strings' integer data into the regular uint array, since effectively they are now merged. Eventually, this should lead to moving the strings into the XxxxData classes so moc doesn't have to collect them early. I don't have a solution for this yet but have some ideas. I've left the StringData class behind because I've found it useful for QMetaObjectBuilder::toCode(). Generated code for QDeviceClosedNotifier (qtextstream.cpp), c++filt'ered: .section .rodata,"a",@progbits QDeviceClosedNotifier::qt_staticMetaObjectStaticContent<(anonymous namespace)::qt_meta_tag_ZN21QDeviceClosedNotifierE_t>: .long 13 # 0xd .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 1 # 0x1 .long 14 # 0xe .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 0 # 0x0 .long 1 # 0x1 .long 0 # 0x0 .long 20 # 0x14 .long 2 # 0x2 .long 10 # 0xa .long 1 # 0x1 .long 43 # 0x2b .long 0 # 0x0 .long 24 # 0x18 .long 21 # 0x15 .long 46 # 0x2e .long 11 # 0xb .long 58 # 0x3a .long 0 # 0x0 .asciz "QDeviceClosedNotifier\000flushStream\000" .zero 1 .section .data.rel.ro,"aw",@progbits QDeviceClosedNotifier::qt_staticMetaObjectRelocatingContent<(anonymous namespace)::qt_meta_tag_ZN21QDeviceClosedNotifierE_t>: .quad QtPrivate::QMetaTypeInterfaceWrapper<void>::metaType .quad QtPrivate::QMetaTypeInterfaceWrapper<void>::metaType .globl QDeviceClosedNotifier::staticMetaObject QDeviceClosedNotifier::staticMetaObject: .quad QObject::staticMetaObject .quad QDeviceClosedNotifier::qt_staticMetaObjectStaticContent<(anonymous namespace)::qt_meta_tag_ZN21QDeviceClosedNotifierE_t>+88 .quad QDeviceClosedNotifier::qt_staticMetaObjectStaticContent<(anonymous namespace)::qt_meta_tag_ZN21QDeviceClosedNotifierE_t> .quad QDeviceClosedNotifier::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) .quad 0 .quad QDeviceClosedNotifier::qt_staticMetaObjectRelocatingContent<(anonymous namespace)::qt_meta_tag_ZN21QDeviceClosedNotifierE_t> .quad 0 Change-Id: I484c9165989ae4eaeea1fffd196c08947c083cb5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjsonparser.cpp')
0 files changed, 0 insertions, 0 deletions