diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp index 449cb62b8..4301c1c22 100644 --- a/src/base/utils/string.cpp +++ b/src/base/utils/string.cpp @@ -32,11 +32,12 @@ #include #include -#include #include #include -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include +#else #include #endif @@ -56,11 +57,7 @@ QString Utils::String::fromDouble(const double n, const int precision) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) QString Utils::String::wildcardToRegexPattern(const QString &pattern) { - // replace [ and ] with [[] and []], respectively - QString escapedPattern = pattern; - escapedPattern.replace(QRegularExpression(u"\\[|\\]"_qs), u"[\\0]"_qs); - - return QRegularExpression::wildcardToRegularExpression(escapedPattern, QRegularExpression::UnanchoredWildcardConversion); + return QRegularExpression::wildcardToRegularExpression(pattern, QRegularExpression::UnanchoredWildcardConversion); } #else // This is marked as internal in QRegExp.cpp, but is exported. The alternative would be to @@ -69,11 +66,7 @@ QString qt_regexp_toCanonical(const QString &pattern, QRegExp::PatternSyntax pat QString Utils::String::wildcardToRegexPattern(const QString &pattern) { - // replace [ and ] with [[] and []], respectively - QString escapedPattern = pattern; - escapedPattern.replace(QRegularExpression(u"\\[|\\]"_qs), u"[\\0]"_qs); - - return qt_regexp_toCanonical(escapedPattern, QRegExp::Wildcard); + return qt_regexp_toCanonical(pattern, QRegExp::Wildcard); } #endif