CMake: Regenerate projects

Change-Id: Iac12acd07513e790e531ae93366fdae70c1c61a5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alexandru Croitor 2020-07-30 15:46:56 +02:00
parent cb80720287
commit 704e215295
3 changed files with 5 additions and 3 deletions

View File

@ -93,7 +93,6 @@ qt_add_module(Core
kernel/qobjectdefs_impl.h
kernel/qpointer.cpp kernel/qpointer.h
kernel/qproperty.cpp kernel/qproperty.h kernel/qproperty_p.h
kernel/qpropertybinding.cpp kernel/qpropertybinding_p.h
kernel/qpropertyprivate.h
kernel/qsharedmemory.cpp kernel/qsharedmemory.h kernel/qsharedmemory_p.h
kernel/qsignalmapper.cpp kernel/qsignalmapper.h
@ -136,8 +135,10 @@ qt_add_module(Core
statemachine/qstate.cpp statemachine/qstate.h statemachine/qstate_p.h
statemachine/qstatemachine.cpp statemachine/qstatemachine.h statemachine/qstatemachine_p.h
text/qbytearray.cpp text/qbytearray.h text/qbytearray_p.h
text/qbytearrayalgorithms.h
text/qbytearraylist.cpp text/qbytearraylist.h
text/qbytearraymatcher.cpp text/qbytearraymatcher.h
text/qbytearrayview.h
text/qbytedata_p.h
text/qchar.h
text/qcollator.cpp text/qcollator.h text/qcollator_p.h
@ -209,6 +210,7 @@ qt_add_module(Core
tools/qscopeguard.h
tools/qset.h
tools/qshareddata.cpp tools/qshareddata.h
tools/qshareddata_impl.h
tools/qsharedpointer.cpp tools/qsharedpointer.h
tools/qsharedpointer_impl.h
tools/qsize.cpp tools/qsize.h

View File

@ -384,7 +384,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
qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi)
LIBRARIES
crypto_${CMAKE_SYSTEM_PROCESSOR}
ssl_${CMAKE_SYSTEM_PROCESSOR}

View File

@ -384,7 +384,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
qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi)
LIBRARIES
crypto_${CMAKE_SYSTEM_PROCESSOR}
ssl_${CMAKE_SYSTEM_PROCESSOR}