Merge branch 'develop' into feature/yubikey

2017-03-03 22:04:55 +01:00
parent 7eb7dbe0be 37c9ad8e8d
commit 5df7b9aa85
14 changed files with 1606 additions and 641 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -158,7 +158,7 @@ add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")

 add_subdirectory(http)
 if(WITH_XC_HTTP)
-    set(keepasshttp_LIB keepasshttp)
+    set(keepasshttp_LIB keepasshttp qhttp Qt5::Network)
 endif()

 add_subdirectory(autotype)
@@ -205,11 +205,9 @@ target_link_libraries(keepassx_core
                      ${keepasshttp_LIB}
                      ${autotype_LIB}
                      zxcvbn
-                      qhttp
                      Qt5::Core
                      Qt5::Concurrent
                      Qt5::Widgets
-                      Qt5::Network
                      ${GCRYPT_LIBRARIES}
                      ${GPGERROR_LIBRARIES}
                      ${ZLIB_LIBRARIES}