diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:09 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:09 +0200 |
| commit | 6074956c2089dd0507d2930c638fa8c930f4e21c (patch) | |
| tree | 69d6743a71f63694819ff7b758cc6ff06d740b87 | |
| parent | 3f56c6b4bd1e3883581340243b4a7289807fffc9 (diff) | |
| parent | a7e5b49566bae34c32537b7d34533c45242f9310 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I054604b9cf4e92b0c0aaabef4695b7e83cd9502d
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tools/qscxmlc/moc.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 9b73845..ffe0295 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h index 56aedad..2461ad2 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); } |