diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index 2b15364fd..89f9d3185 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -181,7 +181,9 @@ bool QUdpSocketPrivate::doEnsureInitialized(const QHostAddress &bindAddress, qui
     QAbstractSocket::NetworkLayerProtocol proto = address->protocol();
     if (proto == QUdpSocket::UnknownNetworkLayerProtocol) {
         address = &remoteAddress;
+#if defined(QT_NO_IPV6)
         proto = address->protocol();
+#endif
     }
 
 #if defined(QT_NO_IPV6)
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index b27575e9c..00ec8e884 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -3886,16 +3886,13 @@ bool QXmlSimpleReaderPrivate::processElementEmptyTag()
                 return false;
             }
             // ... followed by endPrefixMapping
-            QStringList prefixesBefore, prefixesAfter;
-            if (contentHnd) {
-                prefixesBefore = namespaceSupport.prefixes();
-            }
+            QStringList prefixesBefore = namespaceSupport.prefixes();
             namespaceSupport.popContext();
             // call the handler for prefix mapping
-            prefixesAfter = namespaceSupport.prefixes();
-            for (QStringList::Iterator it = prefixesBefore.begin(); it != prefixesBefore.end(); ++it) {
-                if (!prefixesAfter.contains(*it)) {
-                    if (!contentHnd->endPrefixMapping(*it)) {
+            QStringList prefixesAfter = namespaceSupport.prefixes();
+            foreach (const QString &it, prefixesBefore) {
+                if (!prefixesAfter.contains(it)) {
+                    if (!contentHnd->endPrefixMapping(it)) {
                         reportParseError(contentHnd->errorString());
                         return false;
                     }