diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 20:53:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 20:53:52 (GMT) |
| commit | ccebbb663a1b21204057d8b799de3ddf1b63307e (patch) | |
| tree | b166fa2adbe5d7ab807189b2eb84edb4b5c0facb /src/script/api | |
| parent | 8deaf82914c5ec8da7bc49f913d03a3754e1af0c (diff) | |
| parent | 68affbdc60b6cc48b6e7786ffffe2b7512cade64 (diff) | |
| download | Qt-ccebbb663a1b21204057d8b799de3ddf1b63307e.zip Qt-ccebbb663a1b21204057d8b799de3ddf1b63307e.tar.gz Qt-ccebbb663a1b21204057d8b799de3ddf1b63307e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix performance penalty in Win32MakefileGenerator::findHighestVersion
Allow QDial to wrap value when wrapping property is set.
QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 69abcad..1fcbd73 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1744,7 +1744,9 @@ QVariant QScriptEnginePrivate::toVariant(JSC::ExecState *exec, JSC::JSValue valu else if (QScriptDeclarativeClass *dc = declarativeClass(value)) return dc->toVariant(declarativeObject(value)); return variantMapFromObject(exec, JSC::asObject(value)); - } else if (value.isNumber()) { + } else if (value.isInt32()) { + return QVariant(toInt32(exec, value)); + } else if (value.isDouble()) { return QVariant(toNumber(exec, value)); } else if (value.isString()) { return QVariant(toString(exec, value)); |