summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-27 17:31:27 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-24 00:19:24 +0200
commit369cb1470d06b01934e616757ad98db2bb9ebb20 (patch)
tree80b16534be01cc1c8ab4e3e4c16bc96668a6587a /src/gui/text
parente7e7540aecc5a4a44f1d1a25e58ccbcf662cbe24 (diff)
Clean up int based convert() API
Pass QMetaType instances instead. Change-Id: I07366cea566fdebf5bb793aa8087f8109216ec0c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qcssparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 9b1c67c8d5..b57f933c37 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -710,7 +710,7 @@ static Qt::Alignment parseAlignment(const QCss::Value *values, int count)
static ColorData parseColorValue(QCss::Value v)
{
if (v.type == Value::Identifier || v.type == Value::String) {
- v.variant.convert(QMetaType::QColor);
+ v.variant.convert(QMetaType::fromType<QColor>());
v.type = Value::Color;
}
@@ -2759,7 +2759,7 @@ bool Parser::parseTerm(Value *value)
switch (lookup()) {
case NUMBER:
value->type = Value::Number;
- value->variant.convert(QMetaType::Double);
+ value->variant.convert(QMetaType::fromType<double>());
break;
case PERCENTAGE:
value->type = Value::Percentage;