diff --git a/CMakeLists.txt b/CMakeLists.txt index 160160148..fb6991554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,7 @@ # ################################################################################ -cmake_minimum_required(VERSION 3.9) -#3.9 for qt5_add_big_resources - +cmake_minimum_required(VERSION 3.1) get_cmake_property(vars CACHE_VARIABLES) foreach(var ${vars}) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 18373675a..8e4ae57ac 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -19,7 +19,7 @@ # along with this program. If not, see . # ################################################################################ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.1) project(linphoneqt VERSION 4.2.0) @@ -257,7 +257,9 @@ else () endif () set(QRC_RESOURCES resources.qrc) -qt5_add_big_resources(QRC_BIG_RESOURCES resources.qrc) + +#qt5_add_big_resources(QRC_BIG_RESOURCES resources.qrc) #Use this macro if resources size is too high + set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages") set(I18N_FILENAME i18n.qrc) set(LANGUAGES da de en es fr_FR hu it ja lt pt_BR ru sv tr uk zh_CN) @@ -359,8 +361,8 @@ list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_DIRECTORY}/${I18N_F get_directory_property(TS_FILES DIRECTORY "${LANGUAGES_DIRECTORY}" DEFINITION TS_FILES) list(APPEND SOURCES ${TS_FILES}) -#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) -add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES}) +add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) +#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES}) if(TARGET_NAME_ONLY) add_library(${APP_LIBRARY_ONLY} OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS} ${QML_SOURCES}}) endif() diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoColorEmoji.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoColorEmoji.ttf deleted file mode 100644 index 69cf21a1a..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoColorEmoji.ttf and /dev/null differ diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoEmoji-Regular.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoEmoji-Regular.ttf deleted file mode 100644 index 19b7badf4..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoEmoji-Regular.ttf and /dev/null differ diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Bold.otf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Bold.otf deleted file mode 100644 index 76c4827a0..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Bold.otf and /dev/null differ diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Regular.otf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Regular.otf deleted file mode 100644 index 296fbebd8..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansCJKjp-Regular.otf and /dev/null differ diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Bold.otf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Bold.otf deleted file mode 100644 index 849a07a97..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Bold.otf and /dev/null differ diff --git a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Regular.otf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Regular.otf deleted file mode 100644 index ee1e304d6..000000000 Binary files a/linphone-app/assets/fonts/NotoSans-hinted/NotoSansSC-Regular.otf and /dev/null differ diff --git a/linphone-app/assets/languages/CMakeLists.txt b/linphone-app/assets/languages/CMakeLists.txt index a7ca343cc..5e2a6a5ee 100644 --- a/linphone-app/assets/languages/CMakeLists.txt +++ b/linphone-app/assets/languages/CMakeLists.txt @@ -50,7 +50,7 @@ set(LRELEASE_OPTIONS "") #Clean existing generated file to force re-creation file(REMOVE ${QM_FILES}) file(REMOVE ${TARGET_TS_FILES}) -file(REMOVE ${QRC_BIG_RESOURCES}) +#file(REMOVE ${QRC_BIG_RESOURCES}) #Remove .o of resources before build. It is need to update resources from changes add_custom_command(OUTPUT ${TARGET_TS_FILES} COMMAND ${Qt5_LUPDATE_EXECUTABLE} diff --git a/linphone-app/resources.qrc b/linphone-app/resources.qrc index f07913057..aac0c7fd2 100644 --- a/linphone-app/resources.qrc +++ b/linphone-app/resources.qrc @@ -481,11 +481,5 @@ ui/dev-modules/Colors/Colors.qml ui/dev-modules/Units/Units.qml assets/icon.ico - assets/fonts/NotoSans-hinted/NotoSansCJKjp-Regular.otf - assets/fonts/NotoSans-hinted/NotoSansCJKjp-Bold.otf - assets/fonts/NotoSans-hinted/NotoColorEmoji.ttf - assets/fonts/NotoSans-hinted/NotoEmoji-Regular.ttf - assets/fonts/NotoSans-hinted/NotoSansSC-Bold.otf - assets/fonts/NotoSans-hinted/NotoSansSC-Regular.otf