diff --git a/CMakeLists.txt b/CMakeLists.txt index ce42e6967..6759bc912 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,7 @@ if(WITH_TESTS) endif(WITH_TESTS) find_package(Qt5Core REQUIRED) +find_package(Qt5Concurrent REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Test REQUIRED) find_package(Qt5LinguistTools REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 770c664e0..62009d8a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,12 +173,13 @@ qt5_wrap_ui(keepassx_SOURCES ${keepassx_FORMS}) add_library(keepassx_core STATIC ${keepassx_SOURCES}) set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE) -target_link_libraries(keepassx_core Qt5::Core Qt5::Widgets) +target_link_libraries(keepassx_core Qt5::Core Qt5::Concurrent Qt5::Widgets) add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE}) target_link_libraries(${PROGNAME} keepassx_core Qt5::Core + Qt5::Concurrent Qt5::Widgets ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES}) diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index 5bf9cae58..6297017ca 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -18,7 +18,7 @@ #include "CompositeKey.h" #include "CompositeKey_p.h" -#include +#include #include #include "crypto/CryptoHash.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b3ae0555d..7ea399fed 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -86,6 +86,7 @@ endmacro(add_unit_test) set(TEST_LIBRARIES keepassx_core Qt5::Core + Qt5::Concurrent Qt5::Widgets Qt5::Test ${GCRYPT_LIBRARIES} @@ -94,7 +95,7 @@ set(TEST_LIBRARIES set(testsupport_SOURCES modeltest.cpp FailDevice.cpp) add_library(testsupport STATIC ${testsupport_SOURCES}) -target_link_libraries(testsupport Qt5::Core Qt5::Widgets Qt5::Test) +target_link_libraries(testsupport Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Test) add_unit_test(NAME testgroup SOURCES TestGroup.cpp LIBS ${TEST_LIBRARIES}) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 6f0fa6359..7988467fe 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -19,6 +19,7 @@ add_executable(kdbx-extract kdbx-extract.cpp) target_link_libraries(kdbx-extract keepassx_core Qt5::Core + Qt5::Concurrent Qt5::Widgets ${GCRYPT_LIBRARIES} ${ZLIB_LIBRARIES})