diff --git a/src/core/io/qtldurl.cpp b/src/core/io/qtldurl.cpp
index ba186d791..3f65dc443 100644
--- a/src/core/io/qtldurl.cpp
+++ b/src/core/io/qtldurl.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 static bool containsTLDEntry(const QString &entry)
 {
-    for (int i = 0; i < TLDTblSize; i++) {
+    for (qint16 i = 0; i < TLDTblSize; i++) {
         QString currentEntry = QString::fromUtf8(TLDTbl[i]);
         if (currentEntry == entry)
             return true;
diff --git a/src/core/io/qurltlds_p.h b/src/core/io/qurltlds_p.h
index f1a850805..f87ba3455 100644
--- a/src/core/io/qurltlds_p.h
+++ b/src/core/io/qurltlds_p.h
@@ -8830,7 +8830,7 @@ static const char* TLDTbl[] = {
     "zone.id\0",
 };
 
-static const qint32 TLDTblSize = 8767;
+static const qint16 TLDTblSize = 8767;
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 6ff7b8b46..b4fb1c46f 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -736,12 +736,12 @@ static const struct KeyTblData {
     XF86XK_LaunchF,             Qt::Key_LaunchF,
     // XF86XK_LaunchH,             Qt::Key_LaunchH,
 };
-static const int KeyTblSize = sizeof(KeyTbl) / sizeof(KeyTblData);
+static const qint16 KeyTblSize = sizeof(KeyTbl) / sizeof(KeyTblData);
 
 static int translateKeySym(const uint key)
 {
     int code = -1;
-    for (int i = 0; i < KeyTblSize; i++) {
+    for (qint16 i = 0; i < KeyTblSize; i++) {
         if (KeyTbl[i].x11key == key) {
             code = KeyTbl[i].qtkey;
             break;
diff --git a/src/gui/painting/qcolor_p.cpp b/src/gui/painting/qcolor_p.cpp
index d4d68a13b..2191dfe5e 100644
--- a/src/gui/painting/qcolor_p.cpp
+++ b/src/gui/painting/qcolor_p.cpp
@@ -261,11 +261,11 @@ static const struct RGBData {
 };
 #undef RGBCOLOR
 
-static const int rgbTblSize = sizeof(rgbTbl) / sizeof(RGBData);
+static const qint16 rgbTblSize = sizeof(rgbTbl) / sizeof(RGBData);
 
 bool qt_get_named_rgb(const char *name, QRgb* rgb)
 {
-    for (int i = 0; i < rgbTblSize; i++) {
+    for (qint16 i = 0; i < rgbTblSize; i++) {
         if (qstrcmp(rgbTbl[i].name, name) == 0) {
             *rgb = rgbTbl[i].value;
             return true;
@@ -278,7 +278,7 @@ QStringList qt_get_colornames()
 {
     static QStringList lst;
     if (lst.isEmpty()) {
-        for (int i = 0; i < rgbTblSize; i++)
+        for (qint16 i = 0; i < rgbTblSize; i++)
             lst << QString::fromLatin1(rgbTbl[i].name);
     }
     return lst;
diff --git a/util/qurl-generateTLDs/main.cpp b/util/qurl-generateTLDs/main.cpp
index 35ee3f597..272e828cc 100644
--- a/util/qurl-generateTLDs/main.cpp
+++ b/util/qurl-generateTLDs/main.cpp
@@ -109,7 +109,7 @@ int main(int argc, char **argv) {
     outFile.write("] = {\n");
     outFile.write(outDataBufferBA);
     outFile.write("};\n\n");
-    outFile.write("static const qint32 TLDTblSize = ");
+    outFile.write("static const qint16 TLDTblSize = ");
     outFile.write(QByteArray::number(lineCount));
     outFile.write(";\n");
     outFile.close();