summaryrefslogtreecommitdiffstats
path: root/src/tools/moc
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-08-30 11:27:36 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-30 13:51:22 +0200
commit861786bb502570b12f5d50c0d48cb4ecbe6d0238 (patch)
tree6d1c46704a32b39f7a7f058c429ee788b5972131 /src/tools/moc
parent1cebd906af95e2c8ae37f1eae4a1c5019640b3b3 (diff)
Fix static plugins for classes in namespaces.
Breakage introduced by 819d0203e6fd9d27dc4c22e8c3cb8b437998f62a . Extend QT_MOC_EXPORT to take the unqualified class name as well for the function names. Change-Id: I736097b564caa37c522d723780663d03341f9032 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Lukas Geyer <lgeyer@gmx.at>
Diffstat (limited to 'src/tools/moc')
-rw-r--r--src/tools/moc/generator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index ccc73c1d4d..6aaefc452d 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -1452,7 +1452,8 @@ void Generator::generatePluginMetaData()
int pos = cdef->qualified.indexOf("::");
for ( ; pos != -1 ; pos = cdef->qualified.indexOf("::", pos + 2) )
fprintf(out, "using namespace %s;\n", cdef->qualified.left(pos).constData());
- fprintf(out, "QT_MOC_EXPORT_PLUGIN(%s)\n\n", cdef->qualified.constData());
+ fprintf(out, "QT_MOC_EXPORT_PLUGIN(%s, %s)\n\n",
+ cdef->qualified.constData(), cdef->classname.constData());
}
QT_END_NAMESPACE