diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-21 19:30:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 19:08:53 +0200 |
| commit | a3bd80c08cd046d892c666098093ec20fc9e1321 (patch) | |
| tree | 5016362fcda4c093c8cb3274adf4c6d6a7d22719 /src/network | |
| parent | 9959090da84ee8681126da5763365e3e2a746f7e (diff) | |
CMake: Regenerate projects
Clean up the state of the projects,
before changing the internal CMake API function names.
Task-number: QTBUG-86815
Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index ee82f114f1..623ea27e26 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -45,6 +45,7 @@ qt_add_module(Network ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h + ssl/qtls_utils_p.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -89,12 +90,13 @@ qt_extend_target(Network CONDITION APPLE qt_extend_target(Network CONDITION WASM SOURCES + access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h + access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) qt_extend_target(Network CONDITION QT_FEATURE_http SOURCES - access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h access/http2/hpacktable.cpp access/http2/hpacktable_p.h @@ -103,6 +105,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_http access/http2/http2streams.cpp access/http2/http2streams_p.h access/http2/huffman.cpp access/http2/huffman_p.h access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h + access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/qhttp2configuration.cpp access/qhttp2configuration.h access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h @@ -389,7 +392,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 1782922ebe..d19457e0e0 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -45,6 +45,7 @@ qt_add_module(Network ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h ssl/qtls_utils_p.h ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h + ssl/qtls_utils_p.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -89,12 +90,13 @@ qt_extend_target(Network CONDITION APPLE qt_extend_target(Network CONDITION WASM SOURCES + access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h + access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) qt_extend_target(Network CONDITION QT_FEATURE_http SOURCES - access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h access/http2/hpacktable.cpp access/http2/hpacktable_p.h @@ -103,6 +105,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_http access/http2/http2streams.cpp access/http2/http2streams_p.h access/http2/huffman.cpp access/http2/huffman_p.h access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h + access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/qhttp2configuration.cpp access/qhttp2configuration.h access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h @@ -389,7 +392,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} |