pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v7.4.0' into develop

Browse Source
This commit is contained in:
maxkadushkin
2023-05-02 23:37:08 +03:00
parent f9f4ff5a81 1eb11261ae
commit bfa6c1c4eb
114 changed files with 1322 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
win-linux/ASCDocumentEditor.pro
View File

@ -26,11 +26,20 @@ message($$PLATFORM_BUILD)
#win32 {
updmodule:!build_xp {
DEFINES += _UPDMODULE
DEFINES += URL_APPCAST_UPDATES=$$join(LINK,,\\\",\\\")
#LIBS += -L$$PWD/3dparty/WinSparkle/$$PLATFORM_BUILD -lWinSparkle
ENV_URL_APPCAST_MAIN = $$(DESKTOP_URL_UPDATES_MAIN_CHANNEL)
!isEmpty(ENV_URL_APPCAST_MAIN) {
DEFINES += URL_APPCAST_UPDATES=\\\"$${ENV_URL_APPCAST_MAIN}\\\"
}
ENV_URL_APPCAST_DEV = $$(DESKTOP_URL_UPDATES_DEV_CHANNEL)
!isEmpty(ENV_URL_APPCAST_DEV) {
DEFINES += URL_APPCAST_DEV_CHANNEL=\\\"$${ENV_URL_APPCAST_DEV}\\\"
}
message(updates is turned on)
message(url: $$join(LINK,,\\\",\\\"))
message(appcast url: $$ENV_URL_APPCAST_MAIN)
message(appcast dev url: \\\"$$ENV_URL_APPCAST_DEV\\\")
}
#}