diff options
| author | Mårten Nordheim <[email protected]> | 2022-03-18 12:28:51 +0100 |
|---|---|---|
| committer | Mårten Nordheim <[email protected]> | 2022-03-23 23:21:56 +0100 |
| commit | ba4e0fc6e9b765edb1e8946b9a8bab7297a8e932 (patch) | |
| tree | 1b2c4cd959bc757e3dfd9d2bbb01a85d205a15c5 /src/quick/util | |
| parent | aa4e5d598248008f8490eef07288f60af6f77900 (diff) | |
Fix use of deprecated QColor ctor
+ Removed some .constData where it was not needed
Change-Id: Ib52c6ec1a5e691c952a82903dea76d79535c72b7
Reviewed-by: Marc Mutz <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 4 | ||||
| -rw-r--r-- | src/quick/util/qquickstyledtext.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index f869d26280..5895b12a62 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -192,7 +192,7 @@ class QQuickColorProvider : public QQmlColorProvider public: QVariant colorFromString(const QString &s, bool *ok) override { - QColor c(s); + QColor c = QColor::fromString(s); if (c.isValid()) { if (ok) *ok = true; return QVariant(c); @@ -204,7 +204,7 @@ public: unsigned rgbaFromString(const QString &s, bool *ok) override { - QColor c(s); + QColor c = QColor::fromString(s); if (c.isValid()) { if (ok) *ok = true; return c.rgba(); diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp index 03aa36d596..10d11e805a 100644 --- a/src/quick/util/qquickstyledtext.cpp +++ b/src/quick/util/qquickstyledtext.cpp @@ -583,7 +583,7 @@ bool QQuickStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QStrin attr = parseAttribute(ch, textIn); if (attr.first == QLatin1String("color")) { valid = true; - format.setForeground(QColor(attr.second)); + format.setForeground(QColor::fromString(attr.second)); } else if (attr.first == QLatin1String("size")) { valid = true; int size = attr.second.toInt(); |