diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-12-20 12:27:49 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-23 20:12:44 +0000 |
| commit | 60544533125e83cf097a753468ce277905c3829f (patch) | |
| tree | bc1bd01eed6bf7eaaa226c8f395a3202952566b1 /tools/dumpcpp/moc.cpp | |
| parent | 74fb17be2eac677b558d65e1cf400e560a387207 (diff) | |
Port from <cctype> toupper() to QtMiscUtils::toAsciiUpper()
The C toupper function is locale-dependent. Given the right locale
(Türkiye, e.g.), toupper(i) is either
- İ (LATIN CAPITAL LETTER I WITH DOT ABOVE; if representable) or
- i (unchanged; if it isn't)
Both results are wrong for the use-cases at hand.
Task-number: QTBUG-109235
Change-Id: Ia9726f0079c5f2625d97a341836b3d4505db6be1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
(cherry picked from commit 09b4615abcdbef7087bb9862a3e73f3bb7930768)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tools/dumpcpp/moc.cpp')
| -rw-r--r-- | tools/dumpcpp/moc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/dumpcpp/moc.cpp b/tools/dumpcpp/moc.cpp index 78507bc..99f41c2 100644 --- a/tools/dumpcpp/moc.cpp +++ b/tools/dumpcpp/moc.cpp @@ -10,6 +10,8 @@ #include <QTemporaryFile> #include <QTextStream> +#include <private/qtools_p.h> + QT_BEGIN_NAMESPACE QByteArray setterName(const QByteArray &propertyName) @@ -18,7 +20,7 @@ QByteArray setterName(const QByteArray &propertyName) if (isupper(setter.at(0))) { setter = "Set" + setter; } else { - setter[0] = char(toupper(setter[0])); + setter[0] = QtMiscUtils::toAsciiUpper(setter[0]); setter = "set" + setter; } return setter; |