From 7cc5fec6978c47cb60fce3358fdaaa42671cdcff Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 7 Sep 2012 10:43:18 +0200 Subject: [PATCH] qmlplugindump: Take care of 'void' types QMetaMethod::typeName() does now return "void" instead of an empty string (change 22d621dd). Change-Id: I70affc450a7dd36b121cbcf580c0ca6fd5944f0b Reviewed-by: Christian Kamm --- tools/qmlplugindump/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index f753dcf..b2e503c 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -473,7 +473,7 @@ private: && !meth.revision() && meth.methodType() == QMetaMethod::Signal && meth.parameterNames().isEmpty() - && typeName.isEmpty()) { + && typeName != QLatin1String("void")) { // don't mention implicit signals return; } @@ -490,7 +490,7 @@ private: qml->writeScriptBinding(QLatin1String("revision"), QString::number(revision)); #endif - if (! typeName.isEmpty()) + if (typeName != QLatin1String("void")) qml->writeScriptBinding(QLatin1String("type"), enquote(typeName)); for (int i = 0; i < meth.parameterTypes().size(); ++i) { -- 2.7.4