diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-12-21 10:54:10 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-01-03 08:31:26 +0100 |
| commit | 6e69b40526e4c69b9b46e06a104c5b8a27c61544 (patch) | |
| tree | 39d1907a2045e2c44c5b6d378bb1f8aa9401476d /tools | |
| parent | 59933103570a0e8e0610842ae0040cf054d3f6a2 (diff) | |
Partially update moc copy from qtbase
This applies qtbase/b8c2a0c18a0676595946b5543ff88492a5fc7876 to the
copy of the moc code used in qscxmlc. The moc copy here is severely
out of sync with the qtbase version, so just running update_moc.sh
produces a lot of conflicts, which is why I only applied this one
patch.
Created QTBUG-109556 to keep track of the rest.
Fixes: QTBUG-109235
Pick-to: 6.5 6.4 6.2 5.15
Change-Id: I9e033453928110ac2aab1ecd6cde824c6abe0a97
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qscxmlc/moc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h index de3778f..2381a4f 100644 --- a/tools/qscxmlc/moc.h +++ b/tools/qscxmlc/moc.h @@ -5,6 +5,7 @@ #define MOC_H // -- QtScxml +#include <QtCore/private/qtools_p.h> #include <QtCore/qmap.h> #include <QtCore/qpair.h> #include <QtCore/qjsondocument.h> @@ -108,7 +109,7 @@ struct PropertyDef { bool stdCppSet() const { QByteArray s("set"); - s += toupper(name[0]); + s += QtMiscUtils::toAsciiUpper(name[0]); s += name.mid(1); return (s == write); } |