diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:40 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:40 +0200 |
| commit | 014285857ef1cfb2d9965cf7bad871bbc336ce60 (patch) | |
| tree | 0f6b6c4ab81d5dd87a6f2665bdb886afe60259bf | |
| parent | 4fc1cba4c415d84a5879da29f7c459b70fbc15e9 (diff) | |
| parent | d6f61ca7ce11d17651555f12463ae3d7c9746e53 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I74a620e7837a9e23bc1ab04c951b0bde27157062
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 5 | ||||
| -rw-r--r-- | src/activeqt/container/qaxdump.cpp | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0b51738..3317116 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) 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/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 2903cdf..3c4989f 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -74,6 +74,7 @@ #include <private/qobject_p.h> #include <private/qmetaobject_p.h> #include <private/qmetaobjectbuilder_p.h> +#include <private/qtools_p.h> #include <qt_windows.h> #include <ocidl.h> @@ -2386,7 +2387,7 @@ void MetaObjectGenerator::addSetterSlot(const QByteArray &property) if (isupper(prototype.at(0))) { prototype.insert(0, "Set"); } else { - prototype[0] = char(toupper(prototype[0])); + prototype[0] = QtMiscUtils::toAsciiUpper(prototype[0]); prototype.insert(0, "set"); } const QByteArray type = propertyType(property); @@ -2584,7 +2585,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs) set = "Set"; } else { set = "set"; - prototype[0] = char(toupper(prototype[0])); + prototype[0] = QtMiscUtils::toAsciiUpper(prototype[0]); } prototype = set + prototype; diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp index bc74e0f..aece7be 100644 --- a/src/activeqt/container/qaxdump.cpp +++ b/src/activeqt/container/qaxdump.cpp @@ -54,6 +54,7 @@ #include <quuid.h> #include <qt_windows.h> #include <qtextstream.h> +#include <private/qtools_p.h> #include <ctype.h> @@ -124,7 +125,7 @@ static QByteArray toType(const QByteArray &t) if (type.at(0) == 'Q') type.remove(0, 1); - type[0] = toupper(type.at(0)); + type[0] = QtMiscUtils::toAsciiLower(type.at(0)); if (type == "VariantList") type = "List"; else if (type == "Map<QVariant,QVariant>") @@ -362,7 +363,7 @@ QString qax_generateDocumentation(QAxBase *that) setterSlot = "Set" + name; } else { QByteArray nameUp = name; - nameUp[0] = char(toupper(nameUp.at(0))); + nameUp[0] = QtMiscUtils::toAsciiUpper(nameUp.at(0)); setterSlot = "set" + nameUp; } detail += QLatin1String("<a href=\"#") + QString::fromLatin1(setterSlot) + QLatin1String("\">") + |