Merge remote-tracking branch 'upstream/develop' into upstream_update

2021-12-31 18:05:40 +01:00
parent 0c177b1086 9579231ccc
commit fa98ed3ccd
53 changed files with 268 additions and 163 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,9 @@ if(UNIX AND APPLE)
 endif()
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")

+# Fix build with Qt 5.13
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
+
 ##################################### Set Application options #####################################

 ######## Set URLs ########