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

QmlJS: Adding missing properties to Font value property

Browse Source 
Task-number: QTCREATORBUG-17511
Change-Id: I2298bb76bc85b11954a0be1b551972dddefbebbf
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
This commit is contained in:
Thomas Hartmann
2017-01-02 15:14:37 +01:00
parent 018ba5a834
commit afb52340f6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsvalueowner.cpp
View File

@@ -481,6 +481,7 @@ SharedValueOwner::SharedValueOwner(SharedValueOwnerKind kind)
_qmlFontObject = newObject(/*prototype =*/ 0); _qmlFontObject = newObject(/*prototype =*/ 0);
_qmlFontObject->setClassName(QLatin1String("font")); _qmlFontObject->setClassName(QLatin1String("font"));
_qmlFontObject->setMember(QLatin1String("family"), stringValue()); _qmlFontObject->setMember(QLatin1String("family"), stringValue());
_qmlFontObject->setMember(QLatin1String("styleName"), stringValue());
_qmlFontObject->setMember(QLatin1String("weight"), unknownValue()); // ### make me an object _qmlFontObject->setMember(QLatin1String("weight"), unknownValue()); // ### make me an object
_qmlFontObject->setMember(QLatin1String("capitalization"), unknownValue()); // ### make me an object _qmlFontObject->setMember(QLatin1String("capitalization"), unknownValue()); // ### make me an object
_qmlFontObject->setMember(QLatin1String("bold"), booleanValue()); _qmlFontObject->setMember(QLatin1String("bold"), booleanValue());
@@ -492,6 +493,7 @@ SharedValueOwner::SharedValueOwner(SharedValueOwnerKind kind)
_qmlFontObject->setMember(QLatin1String("pixelSize"), intValue()); _qmlFontObject->setMember(QLatin1String("pixelSize"), intValue());
_qmlFontObject->setMember(QLatin1String("letterSpacing"), realValue()); _qmlFontObject->setMember(QLatin1String("letterSpacing"), realValue());
_qmlFontObject->setMember(QLatin1String("wordSpacing"), realValue()); _qmlFontObject->setMember(QLatin1String("wordSpacing"), realValue());
_qmlFontObject->setMember(QLatin1String("hintingPreference"), unknownValue());
_qmlPointObject = newObject(/*prototype =*/ 0); _qmlPointObject = newObject(/*prototype =*/ 0);
_qmlPointObject->setClassName(QLatin1String("Point")); _qmlPointObject->setClassName(QLatin1String("Point"));