mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-06 17:25:24 +08:00
6.5.3 clean
This commit is contained in:
@ -4,8 +4,6 @@
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
// To prevent windows system header files from re-defining min/max
|
||||
#define NOMINMAX 1
|
||||
#if defined(_WIN32)
|
||||
#include <winsock2.h>
|
||||
#else
|
||||
@ -283,7 +281,7 @@ tst_QTcpSocket::tst_QTcpSocket()
|
||||
tmpSocket = 0;
|
||||
|
||||
//This code relates to the socketsConstructedBeforeEventLoop test case
|
||||
earlyConstructedSockets = new SocketPair;
|
||||
earlyConstructedSockets = new SocketPair(this);
|
||||
QVERIFY(earlyConstructedSockets->create());
|
||||
earlyBytesWrittenCount = 0;
|
||||
earlyReadyReadCount = 0;
|
||||
@ -489,8 +487,8 @@ void tst_QTcpSocket::bind_data()
|
||||
bool testIpv6 = false;
|
||||
|
||||
// iterate all interfaces, add all addresses on them as test data
|
||||
QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
|
||||
foreach (const QNetworkInterface &netinterface, interfaces) {
|
||||
const QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
|
||||
for (const QNetworkInterface &netinterface : interfaces) {
|
||||
if (!netinterface.isValid())
|
||||
continue;
|
||||
|
||||
|
Reference in New Issue
Block a user