Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 00:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to QtConcurrent being a separate module now.

Browse Source
This commit is contained in:
Felix Geyer 2015-07-22 17:22:31 +02:00
parent 5ad9edc3fd
commit 208b0f39e6
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -162,6 +162,7 @@ if(WITH_TESTS)
endif(WITH_TESTS) endif(WITH_TESTS)
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package(Qt5Test REQUIRED) find_package(Qt5Test REQUIRED)
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools REQUIRED)

3
src/CMakeLists.txt
View File

@ -173,12 +173,13 @@ qt5_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})
add_library(keepassx_core STATIC ${keepassx_SOURCES}) add_library(keepassx_core STATIC ${keepassx_SOURCES})
set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE) 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}) add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
target_link_libraries(${PROGNAME} target_link_libraries(${PROGNAME}
keepassx_core keepassx_core
Qt5::Core Qt5::Core
Qt5::Concurrent
Qt5::Widgets Qt5::Widgets
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES}) ${ZLIB_LIBRARIES})

2
src/keys/CompositeKey.cpp
View File

@ -18,7 +18,7 @@
#include "CompositeKey.h" #include "CompositeKey.h"
#include "CompositeKey_p.h" #include "CompositeKey_p.h"
#include <QtConcurrentRun> #include <QtConcurrent>
#include <QTime> #include <QTime>
#include "crypto/CryptoHash.h" #include "crypto/CryptoHash.h"

3
tests/CMakeLists.txt
View File

@ -86,6 +86,7 @@ endmacro(add_unit_test)
set(TEST_LIBRARIES set(TEST_LIBRARIES
keepassx_core keepassx_core
Qt5::Core Qt5::Core
Qt5::Concurrent
Qt5::Widgets Qt5::Widgets
Qt5::Test Qt5::Test
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
@ -94,7 +95,7 @@ set(TEST_LIBRARIES
set(testsupport_SOURCES modeltest.cpp FailDevice.cpp) set(testsupport_SOURCES modeltest.cpp FailDevice.cpp)
add_library(testsupport STATIC ${testsupport_SOURCES}) 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 add_unit_test(NAME testgroup SOURCES TestGroup.cpp
LIBS ${TEST_LIBRARIES}) LIBS ${TEST_LIBRARIES})

1
utils/CMakeLists.txt
View File

@ -19,6 +19,7 @@ add_executable(kdbx-extract kdbx-extract.cpp)
target_link_libraries(kdbx-extract target_link_libraries(kdbx-extract
keepassx_core keepassx_core
Qt5::Core Qt5::Core
Qt5::Concurrent
Qt5::Widgets Qt5::Widgets
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES}) ${ZLIB_LIBRARIES})