diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp
index da401ffd78a..b91ec64786f 100644
--- a/src/corelib/global/qhooks.cpp
+++ b/src/corelib/global/qhooks.cpp
@@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = {
     // The required sizes and offsets are tested in tests/auto/other/toolsupport.
     // When this fails and the change was intentional, adjust the test and
     // adjust this value here.
-    4
+    5
 };
 
 Q_STATIC_ASSERT(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0]));
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 0dbe1112cd2..2c09e63d6e0 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -115,14 +115,13 @@ public:
     QString ipString;
     QString scopeId;
 
-    quint32 a;    // IPv4 address
     union {
         Q_IPV6ADDR a6; // IPv6 address
         struct { quint64 c[2]; } a6_64;
         struct { quint32 c[4]; } a6_32;
     };
-    QAbstractSocket::NetworkLayerProtocol protocol;
-
+    quint32 a;    // IPv4 address
+    qint8 protocol;
     bool isParsed;
 
     friend class QHostAddress;
@@ -701,7 +700,7 @@ quint32 QHostAddress::toIPv4Address(bool *ok) const
 QAbstractSocket::NetworkLayerProtocol QHostAddress::protocol() const
 {
     QT_ENSURE_PARSED(this);
-    return d->protocol;
+    return QAbstractSocket::NetworkLayerProtocol(d->protocol);
 }
 
 /*!