diff options
author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-05 10:38:39 -0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 15:07:51 +0100 |
commit | bf7f17060773803f332e8c729a70f47b94243890 (patch) | |
tree | e4c6f80001859748372f19b647ed77dc348e2564 /tests/auto/network/socket/qlocalsocket | |
parent | eb0ce0d5c123c010c978c96683cfd6b651540b07 (diff) |
Make socket descriptors qintptr.
Windows x64 uses 64 bits integer for sockets, to ensure compatibility we
should use ptr sized integers for our socket descriptors.
Task-number: QTBUG-19004
Change-Id: I4b56023874a4f1bad107c66c054fecfedde33d88
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket')
-rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index c7dcd1a646..87cfaeed6c 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -264,7 +264,7 @@ void tst_QLocalSocket::socket_basic() QCOMPARE(socket.isValid(), false); QVERIFY(socket.readBufferSize() == 0); socket.setReadBufferSize(0); - //QCOMPARE(socket.socketDescriptor(), -1); + //QCOMPARE(socket.socketDescriptor(), (qintptr)-1); QCOMPARE(socket.state(), QLocalSocket::UnconnectedState); QCOMPARE(socket.waitForConnected(0), false); QCOMPARE(socket.waitForDisconnected(0), false); @@ -632,7 +632,7 @@ void tst_QLocalSocket::hitMaximumConnections() void tst_QLocalSocket::setSocketDescriptor() { LocalSocket socket; - quintptr minusOne = -1; + qintptr minusOne = -1; socket.setSocketDescriptor(minusOne, QLocalSocket::ConnectingState, QIODevice::Append); QCOMPARE(socket.socketDescriptor(), minusOne); QCOMPARE(socket.state(), QLocalSocket::ConnectingState); |