feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSInterpreter: specifying detailed types for QFont/QVector3D

Browse Source 
We should differentiate between int and real

Reviewed-by:  Christian Kamm
This commit is contained in:
Thomas Hartmann
2010-12-01 11:10:36 +01:00
parent 1e86df7191
commit 2bb6ad4193
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -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()