1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QString::arg: apply the Qt 7 Unicode digit semantics to the bootstrap

Browse Source 
Change-Id: I01ec3c774d9943adb903fffd17b7ef0a106944ca
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Thiago Macieira 2024-02-27 21:16:50 -08:00
parent 30225da91f
commit a30912b906
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/text/qstring.cpp
View File

@ -1607,7 +1607,7 @@ int QAnyStringView::compare(QAnyStringView lhs, QAnyStringView rhs, Qt::CaseSens
// ### Qt 7: do not allow anything but ASCII digits // ### Qt 7: do not allow anything but ASCII digits
// in arg()'s replacements. // in arg()'s replacements.
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
static bool supportUnicodeDigitValuesInArg() static bool supportUnicodeDigitValuesInArg()
{ {
static const bool result = []() { static const bool result = []() {
@ -1630,7 +1630,7 @@ static bool supportUnicodeDigitValuesInArg()
static int qArgDigitValue(QChar ch) noexcept static int qArgDigitValue(QChar ch) noexcept
{ {
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
if (supportUnicodeDigitValuesInArg()) if (supportUnicodeDigitValuesInArg())
return ch.digitValue(); return ch.digitValue();
#endif #endif
@ -8479,7 +8479,7 @@ QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersi
return copy; return copy;
} }
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
static void checkArgEscape(QStringView s) static void checkArgEscape(QStringView s)
{ {
// If we're in here, it means that qArgDigitValue has accepted the // If we're in here, it means that qArgDigitValue has accepted the
@ -8553,7 +8553,7 @@ static ArgEscapeData findArgEscapes(QStringView s)
// ### Qt 7: do not allow anything but ASCII digits // ### Qt 7: do not allow anything but ASCII digits
// in arg()'s replacements. // in arg()'s replacements.
#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
const QChar *escapeBegin = c; const QChar *escapeBegin = c;
const QChar *escapeEnd = escapeBegin + 1; const QChar *escapeEnd = escapeBegin + 1;
#endif #endif
@ -8565,13 +8565,13 @@ static ArgEscapeData findArgEscapes(QStringView s)
if (next_escape != -1) { if (next_escape != -1) {
escape = (10 * escape) + next_escape; escape = (10 * escape) + next_escape;
++c; ++c;
#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
++escapeEnd; ++escapeEnd;
#endif #endif
} }
} }
#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
checkArgEscape(QStringView(escapeBegin, escapeEnd)); checkArgEscape(QStringView(escapeBegin, escapeEnd));
#endif #endif