forked from qt-creator/qt-creator
Modeling: Fix some Qt 6.6 deprecation warnings
Change-Id: I850bff960601595d3273f3a8dedd3f7e6830e9ba Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -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());
|
||||
|
Reference in New Issue
Block a user