Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Ubuntu 18.04 Qt FTBFS (#1377)

Browse Source 
* fix: avoid qt5_add_translation options on old qt5

Check the Qt5Linguist version before passing 'OPTIONS -silent' to
qt5_add_translation(). 'OPTIONS' arg support was merged 2018-01-12
https://codereview.qt.nokia.com/gitweb?p=qt%2Fqttools.git;a=commit;h=9f3dba2ea3978936565aa5e7893415a8a765268e
and made it into the 5.11 release on 2018-05-22.

* fix: ftbfs include <cassert> before using assert()
This commit is contained in:
Charles Kerr
2020-07-29 14:53:55 -05:00
committed by GitHub
parent 8f12792186
commit 77ced2b7c8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/TrMacros.cmake
View File

@@ -194,5 +194,9 @@ macro(tr_qt_add_resources)
endmacro() endmacro()
macro(tr_qt_add_translation) macro(tr_qt_add_translation)
qt5_add_translation(${ARGN} OPTIONS -silent) if (Qt5LinguistTools_VERSION VERSION_LESS 5.11.0)
qt5_add_translation(${ARGN})
else()
qt5_add_translation(${ARGN} OPTIONS -silent)
endif()
endmacro() endmacro()

1
qt/TorrentModel.cc
View File

@@ -7,6 +7,7 @@
*/ */
#include <algorithm> #include <algorithm>
#include <cassert>
#include <iostream> #include <iostream>
#include <utility> #include <utility>