aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-07 10:43:18 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-07 13:57:13 +0200
commit7cc5fec6978c47cb60fce3358fdaaa42671cdcff (patch)
tree304d9f27be086a6497c0e8fafa0864659f54b376 /tools
parent35e302241e329402bb84c01c9cb7095e1c08df53 (diff)
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 <christian.d.kamm@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlplugindump/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index f753dcfa65..b2e503c21d 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) {