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

Modeling: Fix some Qt 6.6 deprecation warnings

Browse Source 
Change-Id: I850bff960601595d3273f3a8dedd3f7e6830e9ba
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2024-06-05 09:44:46 +02:00
parent 5f0b9cd5ff
commit 05d942d488
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
View File

@@ -1157,11 +1157,8 @@ QColor StereotypeDefinitionParser::parseColorExpression()
Token token = d->m_scanner->read(); Token token = d->m_scanner->read();
if (token.type() == Token::TokenIdentifier || token.type() == Token::TokenColor) { if (token.type() == Token::TokenIdentifier || token.type() == Token::TokenColor) {
QString value = token.text().toLower(); QString value = token.text().toLower();
QColor color; if (QColor::isValidColorName(value))
if (QColor::isValidColor(value)) { return QColor::fromString(value);
color.setNamedColor(value);
return color;
}
} }
throw StereotypeDefinitionParserError("Expected color name.", token.sourcePos()); throw StereotypeDefinitionParserError("Expected color name.", token.sourcePos());
} }
@@ -1191,9 +1188,8 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression()
return Value(Float, QVariant(value)); return Value(Float, QVariant(value));
} else if (token.type() == Token::TokenColor) { } else if (token.type() == Token::TokenColor) {
QString value = token.text().toLower(); QString value = token.text().toLower();
QColor color; if (QColor::isValidColorName(value)) {
if (QColor::isValidColor(value)) { const QColor color = QColor::fromString(value);
color.setNamedColor(value);
return Value(Color, QVariant(color)); return Value(Color, QVariant(color));
} else { } else {
throw StereotypeDefinitionParserError("Invalid color.", token.sourcePos()); throw StereotypeDefinitionParserError("Invalid color.", token.sourcePos());