Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-versionController' into merge-task-and-verController

Browse Source 
# Conflicts:
#	InstructorsAndTrainees/CMakeLists.txt
#	InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
#	InstructorsAndTrainees/instructorsandtraineeswidget.cpp
#	ServerLMS/Systems/updatecontroller.cpp
#	ServerLMS/Systems/updatecontroller.h
This commit is contained in:
semenov
2025-01-21 15:52:20 +03:00
parent f6ecd377e7 079a36a76d
commit e521ff9186
50 changed files with 1770 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
InstructorsAndTrainees/CMakeLists.txt
View File

@@ -55,8 +55,12 @@ add_library(InstructorsAndTrainees SHARED
connectorToServer/Core/tools.cpp
connectorToServer/Core/tools.h
connectorToServer/Core/FileData.h
connectorToServer/Core/notifycontroller.cpp
connectorToServer/Core/notifycontroller.h
connectorToServer/Core/versioncontainer.cpp
connectorToServer/Core/versioncontainer.h
connectorToServer/Datas.h
connectorToServer/streamingversiondata.h
messanger/messangerwidget.cpp
messanger/messangerwidget.h
messanger/messangerwidget.ui
@@ -76,6 +80,15 @@ add_library(InstructorsAndTrainees SHARED
tasks/fimtaskswidget.ui
tasks/tasksAmmFim.cpp
tasks/tasksAmmFim.h
widgets/newversionwidget.cpp
widgets/newversionwidget.h
widgets/newversionwidget.ui
widgets/versionselectwidget.cpp
widgets/versionselectwidget.h
widgets/versionselectwidget.ui
widgets/waitanimationwidget.cpp
widgets/waitanimationwidget.h
widgets/waitanimationwidget.ui
resources.qrc
)