1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 0c0690babe..3cc1f32622 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -130,7 +130,7 @@ private slots:
     {
         QTcpSocket *client = nextPendingConnection();
         connect(client, SIGNAL(readyRead()), SLOT(handleClientCommand()));
-        client->setProperty("pendingResponses", qVariantFromValue(responses));
+        client->setProperty("pendingResponses", QVariant::fromValue(responses));
     }
 
     void handleClientCommand()
@@ -145,7 +145,7 @@ private slots:
             client->disconnectFromHost();
         else
             client->write(pendingResponses.dequeue());
-        client->setProperty("pendingResponses", qVariantFromValue(pendingResponses));
+        client->setProperty("pendingResponses", QVariant::fromValue(pendingResponses));
     }
 };
 
@@ -551,7 +551,16 @@ void tst_QSocks5SocketEngine::udpTest()
     QVERIFY(udpSocket.state() == QAbstractSocket::UnconnectedState);
 
     // Bind #1
+#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
+    {
+        bool bindSuccessful = udpSocket.bind(QHostAddress("0.0.0.0"), 0);
+        if (!bindSuccessful)
+            QEXPECT_FAIL("", "QTBUG-23380: Fails on some Ubuntu 11.10 x64 configurations", Abort);
+        QVERIFY(bindSuccessful);
+    }
+#else
     QVERIFY(udpSocket.bind(QHostAddress("0.0.0.0"), 0));
+#endif
     QVERIFY(udpSocket.state() == QAbstractSocket::BoundState);
     QVERIFY(udpSocket.localPort() != 0);