diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /src/network/.prev_CMakeLists.txt | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).
Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/network/.prev_CMakeLists.txt')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 4b7cf9d434..16e25bd8e8 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -82,7 +82,7 @@ if(ANDROID AND (QT_FEATURE_bearermanagement)) jar/QtAndroidBearer.jar ) set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/bearer/libqandroidbearer.so + plugins/bearer/libplugins_bearer_qandroidbearer.so ) set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_NETWORK_STATE @@ -141,11 +141,6 @@ extend_target(Network CONDITION QT_FEATURE_http socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h ) -extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl - SOURCES - access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h -) - extend_target(Network CONDITION QT_FEATURE_dnslookup SOURCES kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h @@ -235,7 +230,7 @@ extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATU extend_target(Network CONDITION QT_FEATURE_gssapi LIBRARIES - gssapi_krb5 + GSSAPI::GSSAPI ) extend_target(Network CONDITION APPLE_UIKIT |