diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-15 21:19:50 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-15 21:19:50 +0000 |
commit | 1ef03f69e8416a70efd14df09e1231ce0bc00ea9 (patch) | |
tree | 7edc868dff999b4f9123bf87e92c9a7cb72e9db1 /src/network/network.pro | |
parent | 23eab78f510a9cfb050980f522dc23409e23fbdb (diff) | |
parent | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (diff) |
Merge "Merge remote-tracking branch 'origin/5.10' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/network/network.pro')
-rw-r--r-- | src/network/network.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index b8272d91d6..9082439f1c 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -10,7 +10,7 @@ DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH #DEFINES += QTCPSOCKETENGINE_DEBUG QTCPSOCKET_DEBUG QTCPSERVER_DEBUG QSSLSOCKET_DEBUG #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG #DEFINES += QSCTPSOCKET_DEBUG QSCTPSERVER_DEBUG -win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 +msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x64000000 QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf |