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 /tests/auto/network/access/qnetworkreply | |
| 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 'tests/auto/network/access/qnetworkreply')
6 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST index a2c6224ce0..915c30bfb3 100644 --- a/tests/auto/network/access/qnetworkreply/BLACKLIST +++ b/tests/auto/network/access/qnetworkreply/BLACKLIST @@ -14,7 +14,7 @@ osx linux # QTBUG-71953 [getFromHttp] -* !android !winrt +* !android [getFromHttpIntoBuffer] osx [getFromHttpIntoBuffer2] diff --git a/tests/auto/network/access/qnetworkreply/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/CMakeLists.txt index f7efa8f7f3..3b138b3918 100644 --- a/tests/auto/network/access/qnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/CMakeLists.txt @@ -1,7 +1,4 @@ # Generated from qnetworkreply.pro. +add_subdirectory(echo) add_subdirectory(test) - -if(NOT WINRT) - add_subdirectory(echo) -endif() diff --git a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro index d3a92436ac..ec6f35a8b1 100644 --- a/tests/auto/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -!winrt:SUBDIRS += echo +SUBDIRS += echo test.depends += $$SUBDIRS SUBDIRS += test diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt index 48759572de..9350c9afbf 100644 --- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt @@ -55,5 +55,5 @@ add_qt_resource(tst_qnetworkreply "qnetworkreply" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index ef017edf58..50572444a1 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -56,5 +56,5 @@ add_qt_resource(tst_qnetworkreply "qnetworkreply" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index d3385c1929..bf09a99d27 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -13,7 +13,7 @@ RESOURCES += ../qnetworkreply.qrc TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ ../index.html ../smb-file.txt -!android:!winrt: TEST_HELPER_INSTALLS = ../echo/echo +!android: TEST_HELPER_INSTALLS = ../echo/echo CONFIG += unsupported/testserver QT_TEST_SERVER_LIST = vsftpd apache2 ftp-proxy danted squid |