Merge remote-tracking branch 'remotes/origin/dev' into feature/qt6-libssh-support

This commit is contained in:
vladimir.kuznetsov 2023-04-03 17:48:55 +03:00
commit 4aba34c18b
28 changed files with 594 additions and 264 deletions

View file

@ -65,6 +65,7 @@ include_directories(
)
set(HEADERS ${HEADERS}
${CMAKE_CURRENT_LIST_DIR}/migrations.h
${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc.h
${CMAKE_CURRENT_LIST_DIR}/amnezia_application.h
${CMAKE_CURRENT_LIST_DIR}/containers/containers_defs.h
@ -92,6 +93,7 @@ if(NOT IOS)
endif()
set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/migrations.cpp
${CMAKE_CURRENT_LIST_DIR}/amnezia_application.cpp
${CMAKE_CURRENT_LIST_DIR}/containers/containers_defs.cpp
${CMAKE_CURRENT_LIST_DIR}/core/errorstrings.cpp