From ad59eb4dfc25f5c6610c5ef055577c08cb6a4c4e Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 5 Oct 2022 06:43:43 +0200
Subject: [PATCH] Revert "Consider brackets within wildcard as regular
 characters"

The implementation appeared to be broken.

This reverts #16965.
PR #17820.
---
 src/base/utils/string.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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 <cmath>
 
 #include <QLocale>
-#include <QRegularExpression>
 #include <QStringList>
 #include <QVector>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QRegularExpression>
+#else
 #include <QRegExp>
 #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