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.

Manual conflict resolutions:
- dropped change to non-existent file moc.cpp
- fixed merge conflict in headers

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)

2 files changed, 6 insertions, 4 deletions

diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 8420d72..e9fdd81 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 e252bcf..fc87cae 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("\">") +