summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2020-03-25 09:40:59 +0200
committerJanne Kangas <janne.kangas@qt.io>2020-03-25 10:16:08 +0200
commit6afe2ec07b50911960886510bcd4506bc97b5771 (patch)
tree155f86400509d0661c3c79a00fdb58dfaedc3069
parent8d6dea2093309e0eabed5d24c341927c20aaa63b (diff)
Make Font property controllable
Allow string type datainput control of Text element font property. As normally with fonts, used font files must be available in the fonts directory. Font name is specified without path and filename extension. Task-id: QT3DS-4086 Change-Id: I7d89efb8b076ff048e3ffbcbcaf7487dcccfdf74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--res/DataModelMetadata/en-us/MetaData.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/DataModelMetadata/en-us/MetaData.xml b/res/DataModelMetadata/en-us/MetaData.xml
index b1085d4..c5d2458 100644
--- a/res/DataModelMetadata/en-us/MetaData.xml
+++ b/res/DataModelMetadata/en-us/MetaData.xml
@@ -461,7 +461,7 @@
<!-- Format -->
<Property name="textstring" formalName="Text String" type="MultiLineString" default="Text" category="Format" description="Text String" controllable="True" />
<Property name="textcolor" formalName="Text Color" type="Color" default="1 1 1 1" category="Format" description="Text Color" controllable="True" />
- <Property name="font" formalName="Font" type="Font" default="TitilliumWeb-Regular" category="Format" description="Font" />
+ <Property name="font" formalName="Font" type="Font" default="TitilliumWeb-Regular" category="Format" description="Font" controllable="True" />
<!-- HW accelerated fonts not supported
<Property name="enableacceleratedfont" formalName="Hardware accelerated font" description="Enabled hardware acclerated font" type="Boolean" default="false" category="Format" />
-->