From 9fabe59b80a4f0354d4d274d8063a35e89b2c701 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Tue, 1 May 2018 22:41:02 +0800
Subject: [PATCH 1/2] Fix usage of Q_DECLARE_TR_FUNCTIONS()

The context parameter shouldn't be enclosed in double quotes.
---
 src/base/bittorrent/torrentinfo.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base/bittorrent/torrentinfo.h b/src/base/bittorrent/torrentinfo.h
index 85c8158d5..6e21df42a 100644
--- a/src/base/bittorrent/torrentinfo.h
+++ b/src/base/bittorrent/torrentinfo.h
@@ -52,7 +52,7 @@ namespace BitTorrent
 
     class TorrentInfo
     {
-        Q_DECLARE_TR_FUNCTIONS("TorrentInfo")
+        Q_DECLARE_TR_FUNCTIONS(TorrentInfo)
 
     public:
 #if LIBTORRENT_VERSION_NUM < 10100

From e423314ac24f5de44a5862bbd8a3dfb7379b701d Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Tue, 1 May 2018 23:25:13 +0800
Subject: [PATCH 2/2] Work around false-positive warning from lupdate

In short, lupdate will get confused when seeing `template <class T>`,
see: QTBUG-55478
---
 src/gui/properties/peersadditiondlg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/properties/peersadditiondlg.h b/src/gui/properties/peersadditiondlg.h
index af76d132b..75322220d 100644
--- a/src/gui/properties/peersadditiondlg.h
+++ b/src/gui/properties/peersadditiondlg.h
@@ -33,7 +33,7 @@
 
 #include "base/bittorrent/peerinfo.h"
 
-template <class T> class QList;
+template <typename T> class QList;
 
 namespace Ui
 {