1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index c27b2c633f..af2a95c391 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -13,7 +13,8 @@
 #include <qjsonobject.h>
 #include <qversionnumber.h>
 #include <stdio.h>
-#include <ctype.h>
+
+#include <private/qtools_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -102,7 +103,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);
     }
@@ -276,8 +277,8 @@ inline QByteArray noRef(const QByteArray &type)
 {
     if (type.endsWith('&')) {
         if (type.endsWith("&&"))
-            return type.left(type.length()-2);
-        return type.left(type.length()-1);
+            return type.left(type.size()-2);
+        return type.left(type.size()-1);
     }
     return type;
 }