diff options
| author | Ali Kianian <ali.kianian@qt.io> | 2023-10-31 15:10:14 +0200 |
|---|---|---|
| committer | Ali Kianian <ali.kianian@qt.io> | 2023-10-31 19:46:14 +0200 |
| commit | 2327961711c7be4c71d9dec4a68e967110bb4f2b (patch) | |
| tree | 7bd9fbd807e0e8bc067a8326c39a02388c433d6a | |
| parent | c0cfe43a7e8e259ce1823c437c297f14d757355f (diff) | |
QmlDesigner: Fix the compatibility error for QColor::isValidColorName
Change-Id: Ia32678cabde37c641368f4d037bd1a0499dd47ec
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/imports/utils/quickstudiocsvtablemodel.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/imports/utils/quickstudiocsvtablemodel.cpp b/src/imports/utils/quickstudiocsvtablemodel.cpp index 6f08f39..d3b2616 100644 --- a/src/imports/utils/quickstudiocsvtablemodel.cpp +++ b/src/imports/utils/quickstudiocsvtablemodel.cpp @@ -44,6 +44,18 @@ #include <QRegularExpression> #include <QTextStream> +static inline bool isValidColorName(const QString &colorName) +{ +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + return QColor::isValidColorName(colorName); +#else + constexpr QStringView colorPattern( + u"(?<color>^(?:#(?:(?:[0-9a-fA-F]{2}){3,4}|(?:[0-9a-fA-F]){3,4}))$)"); + static QRegularExpression colorRegex(colorPattern.toString()); + return colorRegex.match(colorName).hasMatch(); +#endif // >= Qt 6.4 +} + static QVariant stringToVariant(const QString &value) { constexpr QStringView typesPattern{u"(?<boolean>^(?:true|false)$)|" @@ -103,7 +115,7 @@ static QVariant stringToVariant(const QString &value, QMetaType::Type type, bool } if (type == QMetaType::QColor) { - bool conversionOk = QColor::isValidColorName(value); + bool conversionOk = ::isValidColorName(value); if (ok) *ok = conversionOk; |