diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
tree | 363dfd46575d147206267d854ce14747157f432e /src/network/socket/socket.pri | |
parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/network/socket/socket.pri')
-rw-r--r-- | src/network/socket/socket.pri | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index c3a98ea31a..67325ac70f 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -43,10 +43,8 @@ qtConfig(sctp) { socket/qsctpsocket.cpp } -!winrt { - SOURCES += socket/qnativesocketengine.cpp - HEADERS += socket/qnativesocketengine_p.h -} +SOURCES += socket/qnativesocketengine.cpp +HEADERS += socket/qnativesocketengine_p.h unix { SOURCES += socket/qnativesocketengine_unix.cpp @@ -57,13 +55,8 @@ unix { # invalid C/C++ code otherwise. msvc: QMAKE_MOC_OPTIONS += -D_WINSOCK_DEPRECATED_NO_WARNINGS -win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp -win32:!winrt: QMAKE_USE_PRIVATE += advapi32 - -winrt { - SOURCES += socket/qnativesocketengine_winrt.cpp - HEADERS += socket/qnativesocketengine_winrt_p.h -} +win32: SOURCES += socket/qnativesocketengine_win.cpp +win32: QMAKE_USE_PRIVATE += advapi32 qtConfig(localserver) { HEADERS += socket/qlocalserver.h \ @@ -73,7 +66,7 @@ qtConfig(localserver) { SOURCES += socket/qlocalsocket.cpp \ socket/qlocalserver.cpp - integrity|winrt { + integrity { SOURCES += socket/qlocalsocket_tcp.cpp \ socket/qlocalserver_tcp.cpp DEFINES += QT_LOCALSOCKET_TCP |