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

moc: Fix loading of plugins in release mode.

Browse Source 
Generate the plugin meta data with "debug" set to false/true
in two code sections #ifdefed QT_NO_DEBUG.

Do not use the value of QT_NO_DEBUG set at moc compile
time which does not work in release mode/Windows.

Change-Id: I0252795ed063bebb2c3b3784f880e64845b5b7e7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-02-21 11:46:33 +01:00 committed by Qt by Nokia
parent b071aeccc0
commit 4fad7ae76a
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/tools/moc/generator.cpp
View File

@ -1057,41 +1057,55 @@ void Generator::generateSignal(FunctionDef *def,int index)
fprintf(out, "}\n");
}
static void writePluginMetaData(FILE *out, const QJsonObject &data)
{
const QJsonDocument doc(data);
fputs("\nQT_PLUGIN_METADATA_SECTION\n"
"static const unsigned char qt_pluginMetaData[] = {\n"
" 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', ' ',\n ", out);
#if 0
fprintf(out, "\"%s\";\n", doc.toJson().constData());
#else
const QByteArray binary = doc.toBinaryData();
const int last = binary.size() - 1;
for (int i = 0; i < last; ++i) {
fprintf(out, " 0x%02x,", (uchar)binary.at(i));
if (!((i + 1) % 8))
fputs("\n ", out);
}
fprintf(out, " 0x%02x\n};\n", (uchar)binary.at(last));
#endif
}
void Generator::generatePluginMetaData()
{
if (cdef->pluginData.iid.isEmpty())
return;
QJsonObject data;
data.insert(QLatin1String("IID"), QLatin1String(cdef->pluginData.iid.constData()));
data.insert(QLatin1String("className"), QLatin1String(cdef->classname.constData()));
data.insert(QLatin1String("version"), (int)QT_VERSION);
data.insert(QLatin1String("debug"),
#ifdef QT_NO_DEBUG
false
#else
true
#endif
);
data.insert(QLatin1String("MetaData"), cdef->pluginData.metaData.object());
QJsonDocument doc(data);
// Write plugin meta data #ifdefed QT_NO_DEBUG with debug=false,
// true, respectively.
QJsonObject data;
const QString debugKey = QStringLiteral("debug");
data.insert(QStringLiteral("IID"), QLatin1String(cdef->pluginData.iid.constData()));
data.insert(QStringLiteral("className"), QLatin1String(cdef->classname.constData()));
data.insert(QStringLiteral("version"), (int)QT_VERSION);
data.insert(debugKey, QJsonValue(false));
data.insert(QStringLiteral("MetaData"), cdef->pluginData.metaData.object());
fputs("\nQT_PLUGIN_METADATA_SECTION const uint qt_section_alignment_dummy = 42;\n\n"
"#ifdef QT_NO_DEBUG\n", out);
writePluginMetaData(out, data);
fputs("\n#else // QT_NO_DEBUG\n", out);
data.remove(debugKey);
data.insert(debugKey, QJsonValue(true));
writePluginMetaData(out, data);
fputs("#endif // QT_NO_DEBUG\n\n", out);
fprintf(out, "\nQT_PLUGIN_METADATA_SECTION const uint qt_section_alignment_dummy = 42;\n");
fprintf(out,
"\nQT_PLUGIN_METADATA_SECTION\n"
"static const unsigned char qt_pluginMetaData[] = {\n"
" 'Q', 'T', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', ' ', ' ',\n ");
#if 0
fprintf(out, "\"%s\";\n", doc.toJson().constData());
#else
QByteArray binary = doc.toBinaryData();
for (int i = 0; i < binary.size() - 1; ++i) {
fprintf(out, " 0x%02x,", (uchar)binary.at(i));
if (!((i + 1) % 8))
fprintf(out, "\n ");
}
fprintf(out, " 0x%02x\n};\n", (uchar)binary.at(binary.size() - 1));
#endif
// 'Use' all namespaces.
int pos = cdef->qualified.indexOf("::");
for ( ; pos != -1 ; pos = cdef->qualified.indexOf("::", pos + 2) )