diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-15 11:33:26 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-16 20:51:04 +0200 |
| commit | d4e78fce16c29ce8481643048e0f4422a4149899 (patch) | |
| tree | 4e55f2acd065614aeb74a9f6506d183f23959a62 /src/tools | |
| parent | d6502614d0f04695bdb362778ecfc0dbc0b3de21 (diff) | |
Suffix qt_pluginMetaData with class name
Allows defining multiple static plugins in the same translation unit.
Change-Id: I175fd4980b21a461a18c23ed1a62a3cea73e67a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 1853d9df52..9fd61a34c3 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1846,11 +1846,12 @@ void Generator::generatePluginMetaData() if (cdef->pluginData.iid.isEmpty()) return; - fputs("\nQT_PLUGIN_METADATA_SECTION\n" - "static constexpr unsigned char qt_pluginMetaData[] = {\n" + fprintf(out, "\nQT_PLUGIN_METADATA_SECTION\n" + "static constexpr unsigned char qt_pluginMetaData_%s[] = {\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); + " 0, QT_VERSION_MAJOR, QT_VERSION_MINOR, qPluginArchRequirements(),", + cdef->classname.constData()); CborDevice dev(out); |