net-p2p/torrent-file-editor: prepare for Qt 5.13

PR:		238782
This commit is contained in:
Tobias C. Berner 2019-07-13 11:59:53 +00:00
parent fcda43dfbe
commit f1334eb2cb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=506540

View file

@ -1,10 +1,20 @@
--- CMakeLists.txt.orig 2017-12-11 09:39:35 UTC --- CMakeLists.txt.orig 2019-04-11 19:45:13 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -108,6 +108,7 @@ if(QT5_BUILD) @@ -31,6 +31,9 @@ add_custom_target(update_version ALL
COMMAND ${CMAKE_COMMAND} -DWIN32=${WIN32} -DAPP_VERSION="v${APP_VERSION}" -P "${CMAKE_SOURCE_DIR}/Version.cmake"
)
+# Fix build with Qt 5.13
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
+
# Enable C++11
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -129,6 +132,7 @@ if(QT5_BUILD)
else() else()
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
find_package(QJSON 0.8.0 REQUIRED) find_package(QJSON 0.8.0 REQUIRED)
+ include_directories(${QJSON_INCLUDE_DIR}) + include_directories(${QJSON_INCLUDE_DIR})
add_definitions("'-DQStringLiteral(str)=QString::fromUtf8(\"\" str \"\", sizeof(str) - 1)'") add_definitions("'-DQStringLiteral(str)=QString::fromUtf8(\"\" str \"\", sizeof(str) - 1)'")
include_directories(${QJSON_INCLUDE_DIR})
if(WIN32)