Merge remote-tracking branch 'origin/14.0'HEADmaster

Change-Id: I4260181d32ed514e1a912188dbf1040857a83f54

2 files changed, 7 insertions, 11 deletions

diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
index 981641e0ad..d81f71c500 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
@@ -1157,11 +1157,8 @@ QColor StereotypeDefinitionParser::parseColorExpression()
     Token token = d->m_scanner->read();
     if (token.type() == Token::TokenIdentifier || token.type() == Token::TokenColor) {
         QString value = token.text().toLower();
-        QColor color;
-        if (QColor::isValidColor(value)) {
-            color.setNamedColor(value);
-            return color;
-        }
+        if (QColor::isValidColorName(value))
+            return QColor::fromString(value);
     }
     throw StereotypeDefinitionParserError("Expected color name.", token.sourcePos());
 }
@@ -1191,9 +1188,8 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression()
         return Value(Float, QVariant(value));
     } else if (token.type() == Token::TokenColor) {
         QString value = token.text().toLower();
-        QColor color;
-        if (QColor::isValidColor(value)) {
-            color.setNamedColor(value);
+        if (QColor::isValidColorName(value)) {
+            const QColor color = QColor::fromString(value);
             return Value(Color, QVariant(color));
         } else {
             throw StereotypeDefinitionParserError("Invalid color.", token.sourcePos());
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
index 3fa671283a..f02b466830 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
@@ -73,7 +73,7 @@ ModelTreeFilter::ModelTreeFilter(QWidget *parent) :
             },
             d->relationsCheckBox,
             d->diagramElementsCheckBox,
-            customMargin({margin, 0, margin, 0}),
+            customMargins(margin, 0, margin, 0),
         },
         Space(10),
         line(),
@@ -88,11 +88,11 @@ ModelTreeFilter::ModelTreeFilter(QWidget *parent) :
                 Tr::tr("Name:"), d->nameLineEdit, br,
                 Tr::tr("Direction:"), d->directionComboBox, br,
             },
-            customMargin({margin, 0, margin, 0}),
+            customMargins(margin, 0, margin, 0),
         },
         st,
         line(),
-        customMargin({0, margin, 0, 0}),
+        customMargins(0, margin, 0, 0),
     }.attachTo(this);
 
     connect(d->resetViewButton, &QPushButton::clicked, this, &ModelTreeFilter::resetView);