diff options
| author | Martin Gräßlin <mgraesslin@kde.org> | 2012-04-22 08:21:30 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-22 22:03:22 (GMT) |
| commit | ee6708dda8312d6e5af0cf914e8fa277224b16aa (patch) | |
| tree | c8f3701832ad6ddb870923994016733af03bdf0d | |
| parent | 0b286344c59b726ad414af0cdd04777425061478 (diff) | |
| download | Qt-ee6708dda8312d6e5af0cf914e8fa277224b16aa.zip Qt-ee6708dda8312d6e5af0cf914e8fa277224b16aa.tar.gz Qt-ee6708dda8312d6e5af0cf914e8fa277224b16aa.tar.bz2 | |
Fix annotation processing for qtTypeName
An old annotation was incorrectly ignored and not recognized
as the deprecated annotation causing the tool to exit instead
of printing out a warning and returning the type name.
Change-Id: I703933f1f75ca37e908b095a2bde803226fd01a7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp index 7f6463b..1b9f8b5 100644 --- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -353,7 +353,7 @@ static QByteArray qtTypeName(const QString &signature, const QDBusIntrospection: QString oldAnnotationName = QString::fromLatin1("com.trolltech.QtDBus.QtTypeName"); if (paramId >= 0) oldAnnotationName += QString::fromLatin1(".%1%2").arg(QLatin1String(direction)).arg(paramId); - qttype = annotations.value(annotationName); + qttype = annotations.value(oldAnnotationName); if (qttype.isEmpty()) { fprintf(stderr, "Got unknown type `%s'\n", qPrintable(signature)); |