From ee6708dda8312d6e5af0cf914e8fa277224b16aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 22 Apr 2012 10:21:30 +0200 Subject: 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 --- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- cgit v0.12