diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-11 01:00:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-04-11 14:59:13 +0200 |
| commit | 58a42898006f221807a08557f588a2d973a7ada2 (patch) | |
| tree | 62d92617eae5df5aae666ea0902159498b285b24 /tests/auto/network/socket | |
| parent | 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (diff) | |
| parent | 1ec350e35fcea87c527b36cf429b595731059240 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
Change-Id: I22daf269a8f28f80630b5f521b91637531156404
Diffstat (limited to 'tests/auto/network/socket')
| -rw-r--r-- | tests/auto/network/socket/platformsocketengine/platformsocketengine.pri | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri index df43a60065..1b304bfc69 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri @@ -6,10 +6,3 @@ INCLUDEPATH += $$QNETWORK_SRC win32: QMAKE_USE += ws2_32 -unix:qtConfig(reduce_exports) { - SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine_unix.cpp - SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine.cpp - HEADERS += $$QNETWORK_SRC/socket/qnativesocketengine_p.h - SOURCES += $$QNETWORK_SRC/socket/qabstractsocketengine.cpp - HEADERS += $$QNETWORK_SRC/socket/qabstractsocketengine_p.h -} |