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-13 12:51:11 +0000 |
| commit | a7e5b49566bae34c32537b7d34533c45242f9310 (patch) | |
| tree | fdc35df6f6729fd8b2ede7ca8e41eac165df94ca | |
| parent | d53208a150ce4ed2d94779b97c9e01031f62c1ab (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
Change-Id: I9e033453928110ac2aab1ecd6cde824c6abe0a97
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 6e69b40526e4c69b9b46e06a104c5b8a27c61544)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | tools/qscxmlc/moc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h index 0412024..3bdb08f 100644 --- a/tools/qscxmlc/moc.h +++ b/tools/qscxmlc/moc.h @@ -33,6 +33,8 @@ #include <QtCore/qpair.h> #include <QtCore/qjsondocument.h> #include <QtCore/qjsonarray.h> +#include <QtCore/private/qtools_p.h> + #include <ctype.h> QT_BEGIN_NAMESPACE @@ -123,7 +125,7 @@ struct PropertyDef Specification gspec; bool stdCppSet() const { QByteArray s("set"); - s += toupper(name[0]); + s += QtMiscUtils::toAsciiUpper(name[0]); s += name.mid(1); return (s == write); } |