pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v7.0.0' into develop

Browse Source
This commit is contained in:
Elena.Subbotina
2021-10-29 16:19:54 +03:00
parent 958e1fcadf a2b318f6fb
commit 1e9e2ab603
43 changed files with 375 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/Network/FileTransporter/filetransporter.pri
View File

@ -30,8 +30,7 @@ core_mac {
core_ios {
OBJECTIVE_SOURCES += \
$$PWD/src/FileTransporter_mac.mm \
$$PWD/../../../DesktopEditor/common/File_ios.mm
$$PWD/src/FileTransporter_mac.mm
LIBS += -framework Foundation
}

11
Common/Network/WebSocket/websocket.pri
View File

@ -1,6 +1,11 @@
CONFIG += ixwebsocket
core_mac:CONFIG += socketrocket
core_ios:CONFIG += socketrocket
core_mac:CONFIG += apple_platform
core_ios:CONFIG += apple_platform
apple_platform {
CONFIG += socketrocket
} else {
CONFIG += ixwebsocket
}
HEADERS += \
$$PWD/include/websocket.h \

2
Common/Network/network.pro
View File

@ -3,6 +3,8 @@ TEMPLATE = lib
CONFIG -= qt
QT -= core gui
CONFIG += shared
CONFIG += plugin
CORE_ROOT_DIR = $$PWD/../..