diff options
Diffstat (limited to 'src/tools/moc/generator.cpp')
| -rw-r--r-- | src/tools/moc/generator.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index e5154b779b..e499d22618 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1624,8 +1624,11 @@ void Generator::generatePluginMetaData() return; fputs("\nQT_PLUGIN_METADATA_SECTION\n" - "static const unsigned char qt_pluginMetaData[] = {\n" - " 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', '!',", out); + "static constexpr unsigned char qt_pluginMetaData[] = {\n" + " 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', '!',\n" + " // metadata version, Qt version, architectural requirements\n" + " 0, QT_VERSION_MAJOR, QT_VERSION_MINOR, qPluginArchRequirements(),", out); + CborDevice dev(out); CborEncoder enc; @@ -1634,20 +1637,6 @@ void Generator::generatePluginMetaData() CborEncoder map; cbor_encoder_create_map(&enc, &map, CborIndefiniteLength); - dev.nextItem("\"version\""); - cbor_encode_int(&map, int(QtPluginMetaDataKeys::QtVersion)); - cbor_encode_int(&map, QT_VERSION); - - fputs("\n#ifdef QT_NO_DEBUG", out); - dev.nextItem("\"debug\" = false"); - cbor_encode_int(&map, int(QtPluginMetaDataKeys::Debug)); - cbor_encode_boolean(&map, false); - fputs("\n#else", out); - dev.nextItem("\"debug\" = true"); - cbor_encode_int(&map, int(QtPluginMetaDataKeys::Debug)); - cbor_encode_boolean(&map, true); - fputs("\n#endif", out); - dev.nextItem("\"IID\""); cbor_encode_int(&map, int(QtPluginMetaDataKeys::IID)); cbor_encode_text_string(&map, cdef->pluginData.iid.constData(), cdef->pluginData.iid.size()); |