From 2bb6ad41938bbae45eac52f69ca881a5136ff3c2 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 1 Dec 2010 11:10:36 +0100
Subject: [PATCH] QmlJSInterpreter: specifying detailed types for
QFont/QVector3D
We should differentiate between int and real
Reviewed-by: Christian Kamm
---
src/libs/qmljs/qmljsinterpreter.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index 76b68254147..8d8ee7a1605 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -3163,10 +3163,10 @@ void Engine::initializePrototypes()
_qmlFontObject->setProperty("underline", booleanValue());
_qmlFontObject->setProperty("overline", booleanValue());
_qmlFontObject->setProperty("strikeout", booleanValue());
- _qmlFontObject->setProperty("pointSize", numberValue());
- _qmlFontObject->setProperty("pixelSize", numberValue());
- _qmlFontObject->setProperty("letterSpacing", numberValue());
- _qmlFontObject->setProperty("wordSpacing", numberValue());
+ _qmlFontObject->setProperty("pointSize", intValue());
+ _qmlFontObject->setProperty("pixelSize", intValue());
+ _qmlFontObject->setProperty("letterSpacing", realValue());
+ _qmlFontObject->setProperty("wordSpacing", realValue());
_qmlPointObject = newObject(/*prototype =*/ 0);
_qmlPointObject->setClassName(QLatin1String("Point"));
@@ -3187,9 +3187,9 @@ void Engine::initializePrototypes()
_qmlVector3DObject = newObject(/*prototype =*/ 0);
_qmlVector3DObject->setClassName(QLatin1String("Vector3D"));
- _qmlVector3DObject->setProperty("x", numberValue());
- _qmlVector3DObject->setProperty("y", numberValue());
- _qmlVector3DObject->setProperty("z", numberValue());
+ _qmlVector3DObject->setProperty("x", realValue());
+ _qmlVector3DObject->setProperty("y", realValue());
+ _qmlVector3DObject->setProperty("z", realValue());
}
const ObjectValue *Engine::qmlKeysObject()
--
GitLab