summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-02-02 13:15:19 +0100
committerKent Hansen <khansen@trolltech.com>2009-02-02 13:15:19 +0100
commit9e1df82c891d6d844bbac6f76a84c70cb3c88451 (patch)
treeda50a2cf2840de307c336d9ec271938bd427577c
parent940bf9c93ef10aa3303245474f1698ce0cade941 (diff)
Fixes: use QScriptValue::isNumber() to check for shorts and floats
Task: http://code.google.com/p/qtscriptgenerator/issues/detail?id=29 Details: the generic conversion will check if the meta-type ID is that of short or float, which it's not going to be because all numbers are doubles when stored in a QScriptValue.
-rw-r--r--generator/classgenerator.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/generator/classgenerator.cpp b/generator/classgenerator.cpp
index aafd56e..701e21a 100644
--- a/generator/classgenerator.cpp
+++ b/generator/classgenerator.cpp
@@ -164,10 +164,16 @@ static QString builtinTypeTesterFunction(const QString &typeName)
return QLatin1String("isString");
else if (typeName == QLatin1String("double"))
return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("float"))
+ return QLatin1String("isNumber");
else if (typeName == QLatin1String("int"))
return QLatin1String("isNumber");
else if (typeName == QLatin1String("uint"))
return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("short"))
+ return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("unsigned short"))
+ return QLatin1String("isNumber");
else if (typeName == QLatin1String("bool"))
return QLatin1String("isBoolean");
else if (typeName == QLatin1String("QVariant"))