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

QmlDesigner: Fix compile with Qt5

Browse Source 
Change-Id: I366290900fa7198648ca1c6163a35140e0f0a3a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2021-11-04 07:21:03 +01:00
parent 4022043792
commit 662d9a9564
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp
View File

@@ -38,6 +38,9 @@
#include <QPainterPath> #include <QPainterPath>
#include <QRegularExpression> #include <QRegularExpression>
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>
#include <QtMath>
#include <array>
namespace QmlDesigner { namespace QmlDesigner {
@@ -605,7 +608,7 @@ static const std::initializer_list<QStringView> tagAllowList{
// fillOpacity and strokeOpacity aren't actual QML properties, but get mapped anyways // fillOpacity and strokeOpacity aren't actual QML properties, but get mapped anyways
// for completeness. // for completeness.
static const std::initializer_list<std::pair<QStringView, QByteArrayView>> mapping{ static const std::initializer_list<std::pair<QStringView, QString>> mapping{
{u"fill", "fillColor"}, {u"fill", "fillColor"},
{u"stroke", "strokeColor"}, {u"stroke", "strokeColor"},
{u"stroke-width", "strokeWidth"}, {u"stroke-width", "strokeWidth"},
@@ -888,7 +891,7 @@ void applyCSSRules(const CSSRule &cssRule, PropertyMap &properties)
for (const CSSProperty &property : cssRule) { for (const CSSProperty &property : cssRule) {
const QString directive = property.directive; const QString directive = property.directive;
if (auto iter = findKey(mapping, directive); iter != mapping.end()) { if (auto iter = findKey(mapping, directive); iter != mapping.end()) {
const QByteArray directive = iter->second.toByteArray(); const QByteArray directive = iter->second.toUtf8();
properties.insert(directive, convertValue(directive, property.value)); properties.insert(directive, convertValue(directive, property.value));
} }
} }
@@ -935,7 +938,7 @@ void flattenTransformsAndStyles(const QDomElement &element,
if (attributeValue.isEmpty()) if (attributeValue.isEmpty())
continue; continue;
const QByteArray directive = p.second.toByteArray(); const QByteArray directive = p.second.toUtf8();
properties.insert(directive, convertValue(directive, attributeValue)); properties.insert(directive, convertValue(directive, attributeValue));
} }
@@ -1080,7 +1083,7 @@ PropertyMap generatePolygonProperties(const QDomElement &e, const CSSRules &cssR
QPolygonF polygon; QPolygonF polygon;
for (int i = 0; i < pointList.length(); i += 2) for (int i = 0; i < pointList.length(); i += 2)
polygon.emplace_back(pointList[i].toFloat(), pointList[i + 1].toFloat()); polygon.push_back({pointList[i].toFloat(), pointList[i + 1].toFloat()});
if (!polygon.isClosed() && polygon.size()) if (!polygon.isClosed() && polygon.size())
polygon.push_back(polygon.front()); polygon.push_back(polygon.front());