Merge branch 'release/v7.0.0' into develop

This commit is contained in:
Elena.Subbotina
2021-10-29 16:19:54 +03:00
43 changed files with 375 additions and 178 deletions

View File

@ -37,7 +37,7 @@ SOURCES += \
./../DesktopEditor/graphics/TemporaryCS.cpp
# THREAD
core_android:DEFINES += NOT_USE_PTHREAD_CANCEL
core_android:DEFINES += NOT_USE_PTHREAD_CANCEL USE_FILE32API
HEADERS += \
./../DesktopEditor/graphics/BaseThread.h
@ -92,3 +92,8 @@ core_windows {
LIBS += -lRpcrt4
LIBS += -lShell32
}
core_ios {
OBJECTIVE_SOURCES += ./../DesktopEditor/common/File_ios.mm
LIBS += -framework Foundation
}