Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 6 years ago
commit 05d601f8ec

@ -896,7 +896,7 @@ MACRO(FIND_QT5)
# Network
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Network Qt5::Xml)
SET(QT_LIBRARIES ${QT_LIBRARIES} ${ZLIB_LIBRARIES})
SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
IF(WIN32)
SET(QT_LIBRARIES ${QT_LIBRARIES}

Loading…
Cancel
Save