diff --git a/src/app/application.h b/src/app/application.h
index c788d65c6..3f24a96bb 100644
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -71,7 +71,7 @@ namespace RSS
 class Application final : public BaseApplication
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Application)
+    Q_DISABLE_COPY_MOVE(Application)
 
 public:
     Application(int &argc, char **argv);
diff --git a/src/app/applicationinstancemanager.h b/src/app/applicationinstancemanager.h
index 2ea0e3ed2..b186958ff 100644
--- a/src/app/applicationinstancemanager.h
+++ b/src/app/applicationinstancemanager.h
@@ -35,7 +35,7 @@ class QtLocalPeer;
 class ApplicationInstanceManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ApplicationInstanceManager)
+    Q_DISABLE_COPY_MOVE(ApplicationInstanceManager)
 
 public:
     explicit ApplicationInstanceManager(const QString &appId, QObject *parent = nullptr);
diff --git a/src/app/filelogger.h b/src/app/filelogger.h
index 1a4ca6b1b..b62ae2979 100644
--- a/src/app/filelogger.h
+++ b/src/app/filelogger.h
@@ -40,7 +40,7 @@ namespace Log
 class FileLogger : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(FileLogger)
+    Q_DISABLE_COPY_MOVE(FileLogger)
 
 public:
     enum FileLogAgeType
diff --git a/src/app/stacktracedialog.h b/src/app/stacktracedialog.h
index f2876ac1d..8006aeb6e 100644
--- a/src/app/stacktracedialog.h
+++ b/src/app/stacktracedialog.h
@@ -39,7 +39,7 @@ namespace Ui
 class StacktraceDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(StacktraceDialog)
+    Q_DISABLE_COPY_MOVE(StacktraceDialog)
 
 public:
     explicit StacktraceDialog(QWidget *parent = nullptr);
diff --git a/src/base/asyncfilestorage.h b/src/base/asyncfilestorage.h
index 57f8973fa..496aa4b9d 100644
--- a/src/base/asyncfilestorage.h
+++ b/src/base/asyncfilestorage.h
@@ -43,7 +43,7 @@ public:
 class AsyncFileStorage : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AsyncFileStorage)
+    Q_DISABLE_COPY_MOVE(AsyncFileStorage)
 
 public:
     explicit AsyncFileStorage(const QString &storageFolderPath, QObject *parent = nullptr);
diff --git a/src/base/bittorrent/bandwidthscheduler.h b/src/base/bittorrent/bandwidthscheduler.h
index 4ce1cee2a..ecbb43d8d 100644
--- a/src/base/bittorrent/bandwidthscheduler.h
+++ b/src/base/bittorrent/bandwidthscheduler.h
@@ -35,7 +35,7 @@
 class BandwidthScheduler : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(BandwidthScheduler)
+    Q_DISABLE_COPY_MOVE(BandwidthScheduler)
 
 public:
     explicit BandwidthScheduler(QObject *parent = nullptr);
diff --git a/src/base/bittorrent/bencoderesumedatastorage.cpp b/src/base/bittorrent/bencoderesumedatastorage.cpp
index bf59784e9..9c35c85bb 100644
--- a/src/base/bittorrent/bencoderesumedatastorage.cpp
+++ b/src/base/bittorrent/bencoderesumedatastorage.cpp
@@ -57,7 +57,7 @@ namespace BitTorrent
 {
     class BencodeResumeDataStorage::Worker final : public QObject
     {
-        Q_DISABLE_COPY(Worker)
+        Q_DISABLE_COPY_MOVE(Worker)
 
     public:
         explicit Worker(const QDir &resumeDataDir);
diff --git a/src/base/bittorrent/bencoderesumedatastorage.h b/src/base/bittorrent/bencoderesumedatastorage.h
index b631dfaa5..b8a81d1d0 100644
--- a/src/base/bittorrent/bencoderesumedatastorage.h
+++ b/src/base/bittorrent/bencoderesumedatastorage.h
@@ -43,7 +43,7 @@ namespace BitTorrent
     class BencodeResumeDataStorage final : public ResumeDataStorage
     {
         Q_OBJECT
-        Q_DISABLE_COPY(BencodeResumeDataStorage)
+        Q_DISABLE_COPY_MOVE(BencodeResumeDataStorage)
 
     public:
         explicit BencodeResumeDataStorage(const QString &path, QObject *parent = nullptr);
diff --git a/src/base/bittorrent/dbresumedatastorage.cpp b/src/base/bittorrent/dbresumedatastorage.cpp
index a745a0af8..397f5161f 100644
--- a/src/base/bittorrent/dbresumedatastorage.cpp
+++ b/src/base/bittorrent/dbresumedatastorage.cpp
@@ -158,7 +158,7 @@ namespace BitTorrent
 {
     class DBResumeDataStorage::Worker final : public QObject
     {
-        Q_DISABLE_COPY(Worker)
+        Q_DISABLE_COPY_MOVE(Worker)
 
     public:
         Worker(const QString &dbPath, const QString &dbConnectionName);
diff --git a/src/base/bittorrent/dbresumedatastorage.h b/src/base/bittorrent/dbresumedatastorage.h
index 775656322..f166ae6e4 100644
--- a/src/base/bittorrent/dbresumedatastorage.h
+++ b/src/base/bittorrent/dbresumedatastorage.h
@@ -37,7 +37,7 @@ namespace BitTorrent
     class DBResumeDataStorage final : public ResumeDataStorage
     {
         Q_OBJECT
-        Q_DISABLE_COPY(DBResumeDataStorage)
+        Q_DISABLE_COPY_MOVE(DBResumeDataStorage)
 
     public:
         explicit DBResumeDataStorage(const QString &dbPath, QObject *parent = nullptr);
diff --git a/src/base/bittorrent/filesearcher.h b/src/base/bittorrent/filesearcher.h
index 69ab5a318..fd2827f0a 100644
--- a/src/base/bittorrent/filesearcher.h
+++ b/src/base/bittorrent/filesearcher.h
@@ -38,7 +38,7 @@ namespace BitTorrent
 class FileSearcher final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(FileSearcher)
+    Q_DISABLE_COPY_MOVE(FileSearcher)
 
 public:
     FileSearcher() = default;
diff --git a/src/base/bittorrent/portforwarderimpl.h b/src/base/bittorrent/portforwarderimpl.h
index d1ff91ea0..05389b68d 100644
--- a/src/base/bittorrent/portforwarderimpl.h
+++ b/src/base/bittorrent/portforwarderimpl.h
@@ -40,7 +40,7 @@
 class PortForwarderImpl final : public Net::PortForwarder
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PortForwarderImpl)
+    Q_DISABLE_COPY_MOVE(PortForwarderImpl)
 
 public:
     explicit PortForwarderImpl(lt::session *provider, QObject *parent = nullptr);
diff --git a/src/base/bittorrent/resumedatastorage.h b/src/base/bittorrent/resumedatastorage.h
index e96409da1..0b5f436aa 100644
--- a/src/base/bittorrent/resumedatastorage.h
+++ b/src/base/bittorrent/resumedatastorage.h
@@ -41,7 +41,7 @@ namespace BitTorrent
     class ResumeDataStorage : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(ResumeDataStorage)
+        Q_DISABLE_COPY_MOVE(ResumeDataStorage)
 
     public:
         using QObject::QObject;
diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h
index 05d4c9f47..334ca3678 100644
--- a/src/base/bittorrent/session.h
+++ b/src/base/bittorrent/session.h
@@ -211,7 +211,7 @@ namespace BitTorrent
     class Session : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Session)
+        Q_DISABLE_COPY_MOVE(Session)
 
     public:
         static void initInstance();
diff --git a/src/base/bittorrent/statistics.h b/src/base/bittorrent/statistics.h
index 4c500e0f0..5704b1922 100644
--- a/src/base/bittorrent/statistics.h
+++ b/src/base/bittorrent/statistics.h
@@ -39,7 +39,7 @@ namespace BitTorrent
 class Statistics : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Statistics)
+    Q_DISABLE_COPY_MOVE(Statistics)
 
 public:
     explicit Statistics(BitTorrent::Session *session);
diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp
index dca4ce8cc..02c8b1d27 100644
--- a/src/base/bittorrent/torrentimpl.cpp
+++ b/src/base/bittorrent/torrentimpl.cpp
@@ -112,7 +112,7 @@ namespace
         QString firstTrackerMessage;
         QString firstErrorMessage;
 #if (LIBTORRENT_VERSION_NUM >= 20000)
-        const size_t numEndpoints = nativeEntry.endpoints.size() * ((hashes.has_v1() && hashes.has_v2()) ? 2 : 1);
+        const auto numEndpoints = static_cast<qsizetype>(nativeEntry.endpoints.size() * ((hashes.has_v1() && hashes.has_v2()) ? 2 : 1));
         trackerEntry.endpoints.reserve(static_cast<decltype(trackerEntry.endpoints)::size_type>(numEndpoints));
         for (const lt::announce_endpoint &endpoint : nativeEntry.endpoints)
         {
@@ -167,8 +167,8 @@ namespace
             }
         }
 #else
-        const int numEndpoints = nativeEntry.endpoints.size();
-        trackerEntry.endpoints.reserve(numEndpoints);
+        const auto numEndpoints = static_cast<qsizetype>(nativeEntry.endpoints.size());
+        trackerEntry.endpoints.reserve(static_cast<decltype(trackerEntry.endpoints)::size_type>(numEndpoints));
         for (const lt::announce_endpoint &endpoint : nativeEntry.endpoints)
         {
             TrackerEntry::EndpointStats trackerEndpoint;
diff --git a/src/base/bittorrent/torrentimpl.h b/src/base/bittorrent/torrentimpl.h
index 6299f2096..f891b3133 100644
--- a/src/base/bittorrent/torrentimpl.h
+++ b/src/base/bittorrent/torrentimpl.h
@@ -76,7 +76,7 @@ namespace BitTorrent
 
     class TorrentImpl final : public QObject, public Torrent
     {
-        Q_DISABLE_COPY(TorrentImpl)
+        Q_DISABLE_COPY_MOVE(TorrentImpl)
         Q_DECLARE_TR_FUNCTIONS(BitTorrent::TorrentImpl)
 
     public:
diff --git a/src/base/bittorrent/tracker.h b/src/base/bittorrent/tracker.h
index 4a9ba6ed2..2d007961e 100644
--- a/src/base/bittorrent/tracker.h
+++ b/src/base/bittorrent/tracker.h
@@ -72,7 +72,7 @@ namespace BitTorrent
     class Tracker final : public QObject, public Http::IRequestHandler, private Http::ResponseBuilder
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Tracker)
+        Q_DISABLE_COPY_MOVE(Tracker)
 
         struct TrackerAnnounceRequest;
 
diff --git a/src/base/http/connection.h b/src/base/http/connection.h
index abb44de8c..a6f97615e 100644
--- a/src/base/http/connection.h
+++ b/src/base/http/connection.h
@@ -43,7 +43,7 @@ namespace Http
     class Connection : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Connection)
+        Q_DISABLE_COPY_MOVE(Connection)
 
     public:
         Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = nullptr);
diff --git a/src/base/http/server.h b/src/base/http/server.h
index 0d80d03ec..26efb6c28 100644
--- a/src/base/http/server.h
+++ b/src/base/http/server.h
@@ -43,7 +43,7 @@ namespace Http
     class Server final : public QTcpServer
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Server)
+        Q_DISABLE_COPY_MOVE(Server)
 
     public:
         explicit Server(IRequestHandler *requestHandler, QObject *parent = nullptr);
diff --git a/src/base/iconprovider.h b/src/base/iconprovider.h
index 99e4548be..3450186b2 100644
--- a/src/base/iconprovider.h
+++ b/src/base/iconprovider.h
@@ -35,7 +35,7 @@ class QString;
 
 class IconProvider : public QObject
 {
-    Q_DISABLE_COPY(IconProvider)
+    Q_DISABLE_COPY_MOVE(IconProvider)
 
 public:
     static void initInstance();
diff --git a/src/base/logger.h b/src/base/logger.h
index 1f57a6b7b..ec27446e8 100644
--- a/src/base/logger.h
+++ b/src/base/logger.h
@@ -72,7 +72,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Log::MsgTypes)
 class Logger : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Logger)
+    Q_DISABLE_COPY_MOVE(Logger)
 
 public:
     static void initInstance();
diff --git a/src/base/net/downloadhandlerimpl.h b/src/base/net/downloadhandlerimpl.h
index 1a1c6e5ac..875849e01 100644
--- a/src/base/net/downloadhandlerimpl.h
+++ b/src/base/net/downloadhandlerimpl.h
@@ -39,7 +39,7 @@ class QUrl;
 class DownloadHandlerImpl final : public Net::DownloadHandler
 {
     Q_OBJECT
-    Q_DISABLE_COPY(DownloadHandlerImpl)
+    Q_DISABLE_COPY_MOVE(DownloadHandlerImpl)
 
 public:
     DownloadHandlerImpl(Net::DownloadManager *manager, const Net::DownloadRequest &downloadRequest);
diff --git a/src/base/net/downloadmanager.h b/src/base/net/downloadmanager.h
index 0b38e15d0..8b9c51be4 100644
--- a/src/base/net/downloadmanager.h
+++ b/src/base/net/downloadmanager.h
@@ -98,7 +98,7 @@ namespace Net
     class DownloadHandler : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(DownloadHandler)
+        Q_DISABLE_COPY_MOVE(DownloadHandler)
 
     public:
         using QObject::QObject;
@@ -112,7 +112,7 @@ namespace Net
     class DownloadManager : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(DownloadManager)
+        Q_DISABLE_COPY_MOVE(DownloadManager)
 
     public:
         static void initInstance();
diff --git a/src/base/net/geoipmanager.h b/src/base/net/geoipmanager.h
index 596a10564..69d238636 100644
--- a/src/base/net/geoipmanager.h
+++ b/src/base/net/geoipmanager.h
@@ -43,7 +43,7 @@ namespace Net
     class GeoIPManager : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(GeoIPManager)
+        Q_DISABLE_COPY_MOVE(GeoIPManager)
 
     public:
         static void initInstance();
diff --git a/src/base/net/portforwarder.h b/src/base/net/portforwarder.h
index 6fa714bd7..f23ca2197 100644
--- a/src/base/net/portforwarder.h
+++ b/src/base/net/portforwarder.h
@@ -34,7 +34,7 @@ namespace Net
 {
     class PortForwarder : public QObject
     {
-        Q_DISABLE_COPY(PortForwarder)
+        Q_DISABLE_COPY_MOVE(PortForwarder)
 
     public:
         explicit PortForwarder(QObject *parent = nullptr);
diff --git a/src/base/net/proxyconfigurationmanager.h b/src/base/net/proxyconfigurationmanager.h
index c14d8834a..b882dae5a 100644
--- a/src/base/net/proxyconfigurationmanager.h
+++ b/src/base/net/proxyconfigurationmanager.h
@@ -56,7 +56,7 @@ namespace Net
     class ProxyConfigurationManager : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(ProxyConfigurationManager)
+        Q_DISABLE_COPY_MOVE(ProxyConfigurationManager)
 
         explicit ProxyConfigurationManager(QObject *parent = nullptr);
         ~ProxyConfigurationManager() = default;
diff --git a/src/base/net/reverseresolution.h b/src/base/net/reverseresolution.h
index 3e4a5d2d9..cf5d5f734 100644
--- a/src/base/net/reverseresolution.h
+++ b/src/base/net/reverseresolution.h
@@ -40,7 +40,7 @@ namespace Net
     class ReverseResolution : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(ReverseResolution)
+        Q_DISABLE_COPY_MOVE(ReverseResolution)
 
     public:
         explicit ReverseResolution(QObject *parent = nullptr);
diff --git a/src/base/preferences.h b/src/base/preferences.h
index f33361849..ff8263ecf 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -76,7 +76,7 @@ namespace DNS
 class Preferences : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Preferences)
+    Q_DISABLE_COPY_MOVE(Preferences)
 
     Preferences();
 
diff --git a/src/base/rss/rss_article.h b/src/base/rss/rss_article.h
index e070f0850..702e0e171 100644
--- a/src/base/rss/rss_article.h
+++ b/src/base/rss/rss_article.h
@@ -42,7 +42,7 @@ namespace RSS
     class Article : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Article)
+        Q_DISABLE_COPY_MOVE(Article)
 
         friend class Feed;
 
diff --git a/src/base/rss/rss_autodownloader.h b/src/base/rss/rss_autodownloader.h
index a55b3e380..f5923423e 100644
--- a/src/base/rss/rss_autodownloader.h
+++ b/src/base/rss/rss_autodownloader.h
@@ -62,7 +62,7 @@ namespace RSS
     class AutoDownloader final : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(AutoDownloader)
+        Q_DISABLE_COPY_MOVE(AutoDownloader)
 
         friend class ::Application;
 
diff --git a/src/base/rss/rss_feed.h b/src/base/rss/rss_feed.h
index 5731f6ea1..5156a12d3 100644
--- a/src/base/rss/rss_feed.h
+++ b/src/base/rss/rss_feed.h
@@ -59,7 +59,7 @@ namespace RSS
     class Feed final : public Item
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Feed)
+        Q_DISABLE_COPY_MOVE(Feed)
 
         friend class Session;
 
diff --git a/src/base/rss/rss_folder.h b/src/base/rss/rss_folder.h
index f26b8a178..21ef9210c 100644
--- a/src/base/rss/rss_folder.h
+++ b/src/base/rss/rss_folder.h
@@ -40,7 +40,7 @@ namespace RSS
     class Folder final : public Item
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Folder)
+        Q_DISABLE_COPY_MOVE(Folder)
 
         friend class Session;
 
diff --git a/src/base/rss/rss_item.h b/src/base/rss/rss_item.h
index ccc13ea3e..f16d22751 100644
--- a/src/base/rss/rss_item.h
+++ b/src/base/rss/rss_item.h
@@ -42,7 +42,7 @@ namespace RSS
     class Item : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Item)
+        Q_DISABLE_COPY_MOVE(Item)
 
         friend class Folder;
         friend class Session;
diff --git a/src/base/rss/rss_session.h b/src/base/rss/rss_session.h
index e25347e75..09200a466 100644
--- a/src/base/rss/rss_session.h
+++ b/src/base/rss/rss_session.h
@@ -87,7 +87,7 @@ namespace RSS
     class Session : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY(Session)
+        Q_DISABLE_COPY_MOVE(Session)
 
         friend class ::Application;
 
diff --git a/src/base/search/searchdownloadhandler.h b/src/base/search/searchdownloadhandler.h
index 6220b47b0..adb9dc6f7 100644
--- a/src/base/search/searchdownloadhandler.h
+++ b/src/base/search/searchdownloadhandler.h
@@ -37,7 +37,7 @@ class SearchPluginManager;
 class SearchDownloadHandler : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchDownloadHandler)
+    Q_DISABLE_COPY_MOVE(SearchDownloadHandler)
 
     friend class SearchPluginManager;
 
diff --git a/src/base/search/searchhandler.h b/src/base/search/searchhandler.h
index 421060136..981dae502 100644
--- a/src/base/search/searchhandler.h
+++ b/src/base/search/searchhandler.h
@@ -54,7 +54,7 @@ class SearchPluginManager;
 class SearchHandler : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchHandler)
+    Q_DISABLE_COPY_MOVE(SearchHandler)
 
     friend class SearchPluginManager;
 
diff --git a/src/base/search/searchpluginmanager.h b/src/base/search/searchpluginmanager.h
index 60b32e8ff..bc7490cb0 100644
--- a/src/base/search/searchpluginmanager.h
+++ b/src/base/search/searchpluginmanager.h
@@ -60,7 +60,7 @@ class SearchHandler;
 class SearchPluginManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchPluginManager)
+    Q_DISABLE_COPY_MOVE(SearchPluginManager)
 
 public:
     SearchPluginManager();
diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp
index c13ee170c..495d8d657 100644
--- a/src/base/torrentfileswatcher.cpp
+++ b/src/base/torrentfileswatcher.cpp
@@ -192,7 +192,7 @@ namespace
 class TorrentFilesWatcher::Worker final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Worker)
+    Q_DISABLE_COPY_MOVE(Worker)
 
 public:
     Worker();
diff --git a/src/base/torrentfileswatcher.h b/src/base/torrentfileswatcher.h
index f0c928d34..5e76967de 100644
--- a/src/base/torrentfileswatcher.h
+++ b/src/base/torrentfileswatcher.h
@@ -48,7 +48,7 @@ namespace BitTorrent
 class TorrentFilesWatcher final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentFilesWatcher)
+    Q_DISABLE_COPY_MOVE(TorrentFilesWatcher)
 
 public:
     struct WatchedFolderOptions
diff --git a/src/gui/aboutdialog.h b/src/gui/aboutdialog.h
index a8f0065d2..609f24992 100644
--- a/src/gui/aboutdialog.h
+++ b/src/gui/aboutdialog.h
@@ -40,7 +40,7 @@ namespace Ui
 class AboutDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AboutDialog)
+    Q_DISABLE_COPY_MOVE(AboutDialog)
 
 public:
     explicit AboutDialog(QWidget *parent);
diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h
index f68800a9e..372be360e 100644
--- a/src/gui/addnewtorrentdialog.h
+++ b/src/gui/addnewtorrentdialog.h
@@ -59,7 +59,7 @@ class TorrentFileGuard;
 class AddNewTorrentDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AddNewTorrentDialog)
+    Q_DISABLE_COPY_MOVE(AddNewTorrentDialog)
 
 public:
     static const int minPathHistoryLength = 0;
diff --git a/src/gui/banlistoptionsdialog.h b/src/gui/banlistoptionsdialog.h
index a5b1c86aa..54abffe6c 100644
--- a/src/gui/banlistoptionsdialog.h
+++ b/src/gui/banlistoptionsdialog.h
@@ -43,7 +43,7 @@ namespace Ui
 class BanListOptionsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(BanListOptionsDialog)
+    Q_DISABLE_COPY_MOVE(BanListOptionsDialog)
 
 public:
     explicit BanListOptionsDialog(QWidget *parent = nullptr);
diff --git a/src/gui/categoryfilterwidget.h b/src/gui/categoryfilterwidget.h
index 22e0efec6..161fce968 100644
--- a/src/gui/categoryfilterwidget.h
+++ b/src/gui/categoryfilterwidget.h
@@ -33,7 +33,7 @@
 class CategoryFilterWidget final : public QTreeView
 {
     Q_OBJECT
-    Q_DISABLE_COPY(CategoryFilterWidget)
+    Q_DISABLE_COPY_MOVE(CategoryFilterWidget)
 
 public:
     explicit CategoryFilterWidget(QWidget *parent = nullptr);
diff --git a/src/gui/downloadfromurldialog.h b/src/gui/downloadfromurldialog.h
index 7782e3a2a..d6394313e 100644
--- a/src/gui/downloadfromurldialog.h
+++ b/src/gui/downloadfromurldialog.h
@@ -40,7 +40,7 @@ namespace Ui
 class DownloadFromURLDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(DownloadFromURLDialog)
+    Q_DISABLE_COPY_MOVE(DownloadFromURLDialog)
 
 public:
     explicit DownloadFromURLDialog(QWidget *parent);
diff --git a/src/gui/fspathedit.cpp b/src/gui/fspathedit.cpp
index 29190a8c1..146ad965c 100644
--- a/src/gui/fspathedit.cpp
+++ b/src/gui/fspathedit.cpp
@@ -68,7 +68,7 @@ namespace
 class FileSystemPathEdit::FileSystemPathEditPrivate
 {
     Q_DECLARE_PUBLIC(FileSystemPathEdit)
-    Q_DISABLE_COPY(FileSystemPathEditPrivate)
+    Q_DISABLE_COPY_MOVE(FileSystemPathEditPrivate)
 
     FileSystemPathEditPrivate(FileSystemPathEdit *q, Private::FileEditorWithCompletion *editor);
 
diff --git a/src/gui/fspathedit.h b/src/gui/fspathedit.h
index 5b474ff13..25e747500 100644
--- a/src/gui/fspathedit.h
+++ b/src/gui/fspathedit.h
@@ -100,7 +100,7 @@ private:
     virtual void setEditWidgetText(const QString &text) = 0;
 
     QWidget *editWidgetImpl() const;
-    Q_DISABLE_COPY(FileSystemPathEdit)
+    Q_DISABLE_COPY_MOVE(FileSystemPathEdit)
     class FileSystemPathEditPrivate;
     Q_DECLARE_PRIVATE(FileSystemPathEdit)
     FileSystemPathEditPrivate *d_ptr;
diff --git a/src/gui/fspathedit_p.h b/src/gui/fspathedit_p.h
index 2869d5dda..a99384fa9 100644
--- a/src/gui/fspathedit_p.h
+++ b/src/gui/fspathedit_p.h
@@ -112,7 +112,7 @@ namespace Private
     class FileLineEdit final : public QLineEdit, public FileEditorWithCompletion
     {
         Q_OBJECT
-        Q_DISABLE_COPY(FileLineEdit)
+        Q_DISABLE_COPY_MOVE(FileLineEdit)
 
     public:
         FileLineEdit(QWidget *parent = nullptr);
diff --git a/src/gui/ipsubnetwhitelistoptionsdialog.h b/src/gui/ipsubnetwhitelistoptionsdialog.h
index d7e116632..e0cd412fc 100644
--- a/src/gui/ipsubnetwhitelistoptionsdialog.h
+++ b/src/gui/ipsubnetwhitelistoptionsdialog.h
@@ -43,7 +43,7 @@ namespace Ui
 class IPSubnetWhitelistOptionsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(IPSubnetWhitelistOptionsDialog)
+    Q_DISABLE_COPY_MOVE(IPSubnetWhitelistOptionsDialog)
 
 public:
     explicit IPSubnetWhitelistOptionsDialog(QWidget *parent = nullptr);
diff --git a/src/gui/log/logfiltermodel.h b/src/gui/log/logfiltermodel.h
index 0dafdee12..c7d713bb8 100644
--- a/src/gui/log/logfiltermodel.h
+++ b/src/gui/log/logfiltermodel.h
@@ -35,7 +35,7 @@
 class LogFilterModel final : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(LogFilterModel)
+    Q_DISABLE_COPY_MOVE(LogFilterModel)
 
 public:
     explicit LogFilterModel(Log::MsgTypes types = Log::ALL, QObject *parent = nullptr);
diff --git a/src/gui/log/loglistview.h b/src/gui/log/loglistview.h
index eddb4c16f..d9fa5eadd 100644
--- a/src/gui/log/loglistview.h
+++ b/src/gui/log/loglistview.h
@@ -34,7 +34,7 @@
 class LogListView final : public QListView
 {
     Q_OBJECT
-    Q_DISABLE_COPY(LogListView)
+    Q_DISABLE_COPY_MOVE(LogListView)
 
 public:
     explicit LogListView(QWidget *parent = nullptr);
diff --git a/src/gui/log/logmodel.h b/src/gui/log/logmodel.h
index 4b405af5e..4f88bba62 100644
--- a/src/gui/log/logmodel.h
+++ b/src/gui/log/logmodel.h
@@ -39,7 +39,7 @@
 
 class BaseLogModel : public QAbstractListModel
 {
-    Q_DISABLE_COPY(BaseLogModel)
+    Q_DISABLE_COPY_MOVE(BaseLogModel)
 
 public:
     enum MessageTypeRole
@@ -86,7 +86,7 @@ private:
 class LogMessageModel : public BaseLogModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(LogMessageModel)
+    Q_DISABLE_COPY_MOVE(LogMessageModel)
 
 public:
     explicit LogMessageModel(QObject *parent = nullptr);
@@ -101,7 +101,7 @@ private:
 class LogPeerModel : public BaseLogModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(LogPeerModel)
+    Q_DISABLE_COPY_MOVE(LogPeerModel)
 
 public:
     explicit LogPeerModel(QObject *parent = nullptr);
diff --git a/src/gui/optionsdialog.h b/src/gui/optionsdialog.h
index b303dd789..d4e7d3a36 100644
--- a/src/gui/optionsdialog.h
+++ b/src/gui/optionsdialog.h
@@ -59,7 +59,7 @@ namespace Ui
 class OptionsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(OptionsDialog)
+    Q_DISABLE_COPY_MOVE(OptionsDialog)
 
     using ThisType = OptionsDialog;
 
diff --git a/src/gui/previewlistdelegate.h b/src/gui/previewlistdelegate.h
index 7591d94a5..ac0daab21 100644
--- a/src/gui/previewlistdelegate.h
+++ b/src/gui/previewlistdelegate.h
@@ -35,7 +35,7 @@
 class PreviewListDelegate final : public QItemDelegate
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PreviewListDelegate)
+    Q_DISABLE_COPY_MOVE(PreviewListDelegate)
 
 public:
     explicit PreviewListDelegate(QObject *parent = nullptr);
diff --git a/src/gui/previewselectdialog.h b/src/gui/previewselectdialog.h
index 842573202..afc09a4a4 100644
--- a/src/gui/previewselectdialog.h
+++ b/src/gui/previewselectdialog.h
@@ -47,7 +47,7 @@ class PreviewListDelegate;
 class PreviewSelectDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PreviewSelectDialog)
+    Q_DISABLE_COPY_MOVE(PreviewSelectDialog)
 
 public:
     enum PreviewColumn
diff --git a/src/gui/programupdater.h b/src/gui/programupdater.h
index 1a22886a4..88d41985f 100644
--- a/src/gui/programupdater.h
+++ b/src/gui/programupdater.h
@@ -41,7 +41,7 @@ namespace Net
 class ProgramUpdater final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ProgramUpdater)
+    Q_DISABLE_COPY_MOVE(ProgramUpdater)
 
 public:
     using QObject::QObject;
diff --git a/src/gui/properties/downloadedpiecesbar.h b/src/gui/properties/downloadedpiecesbar.h
index 4deac0180..29c33a2f8 100644
--- a/src/gui/properties/downloadedpiecesbar.h
+++ b/src/gui/properties/downloadedpiecesbar.h
@@ -39,7 +39,7 @@ class DownloadedPiecesBar final : public PiecesBar
 {
     using base = PiecesBar;
     Q_OBJECT
-    Q_DISABLE_COPY(DownloadedPiecesBar)
+    Q_DISABLE_COPY_MOVE(DownloadedPiecesBar)
 
 public:
     DownloadedPiecesBar(QWidget *parent);
diff --git a/src/gui/properties/peerlistsortmodel.h b/src/gui/properties/peerlistsortmodel.h
index c00d87984..53f937fa5 100644
--- a/src/gui/properties/peerlistsortmodel.h
+++ b/src/gui/properties/peerlistsortmodel.h
@@ -35,7 +35,7 @@
 class PeerListSortModel final : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PeerListSortModel)
+    Q_DISABLE_COPY_MOVE(PeerListSortModel)
 
 public:
     enum
diff --git a/src/gui/properties/pieceavailabilitybar.h b/src/gui/properties/pieceavailabilitybar.h
index 79033c2f2..97a1c6d87 100644
--- a/src/gui/properties/pieceavailabilitybar.h
+++ b/src/gui/properties/pieceavailabilitybar.h
@@ -34,7 +34,7 @@ class PieceAvailabilityBar final : public PiecesBar
 {
     using base = PiecesBar;
     Q_OBJECT
-    Q_DISABLE_COPY(PieceAvailabilityBar)
+    Q_DISABLE_COPY_MOVE(PieceAvailabilityBar)
 
 public:
     PieceAvailabilityBar(QWidget *parent);
diff --git a/src/gui/properties/piecesbar.h b/src/gui/properties/piecesbar.h
index c505253e3..f5518c200 100644
--- a/src/gui/properties/piecesbar.h
+++ b/src/gui/properties/piecesbar.h
@@ -44,7 +44,7 @@ class PiecesBar : public QWidget
 {
     using base = QWidget;
     Q_OBJECT
-    Q_DISABLE_COPY(PiecesBar)
+    Q_DISABLE_COPY_MOVE(PiecesBar)
 
 public:
     explicit PiecesBar(QWidget *parent = nullptr);
diff --git a/src/gui/properties/propertieswidget.h b/src/gui/properties/propertieswidget.h
index ce57d984b..57329e3e8 100644
--- a/src/gui/properties/propertieswidget.h
+++ b/src/gui/properties/propertieswidget.h
@@ -56,7 +56,7 @@ namespace Ui
 class PropertiesWidget : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PropertiesWidget)
+    Q_DISABLE_COPY_MOVE(PropertiesWidget)
 
 public:
     enum SlideState
diff --git a/src/gui/properties/proplistdelegate.h b/src/gui/properties/proplistdelegate.h
index 7c44dc249..dca97146d 100644
--- a/src/gui/properties/proplistdelegate.h
+++ b/src/gui/properties/proplistdelegate.h
@@ -52,7 +52,7 @@ enum PropColumn
 class PropListDelegate final : public QStyledItemDelegate
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PropListDelegate)
+    Q_DISABLE_COPY_MOVE(PropListDelegate)
 
 public:
     explicit PropListDelegate(PropertiesWidget *properties);
diff --git a/src/gui/properties/proptabbar.h b/src/gui/properties/proptabbar.h
index ef6416770..c68e1df1d 100644
--- a/src/gui/properties/proptabbar.h
+++ b/src/gui/properties/proptabbar.h
@@ -35,7 +35,7 @@ class QButtonGroup;
 class PropTabBar : public QHBoxLayout
 {
   Q_OBJECT
-  Q_DISABLE_COPY(PropTabBar)
+  Q_DISABLE_COPY_MOVE(PropTabBar)
 
 public:
     enum PropertyTab
diff --git a/src/gui/properties/trackerlistwidget.h b/src/gui/properties/trackerlistwidget.h
index a4ed39d10..d93926449 100644
--- a/src/gui/properties/trackerlistwidget.h
+++ b/src/gui/properties/trackerlistwidget.h
@@ -41,7 +41,7 @@ namespace BitTorrent
 class TrackerListWidget : public QTreeWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TrackerListWidget)
+    Q_DISABLE_COPY_MOVE(TrackerListWidget)
 
 public:
     enum TrackerListColumn
diff --git a/src/gui/rss/automatedrssdownloader.h b/src/gui/rss/automatedrssdownloader.h
index f2fabbd72..8b40e9c61 100644
--- a/src/gui/rss/automatedrssdownloader.h
+++ b/src/gui/rss/automatedrssdownloader.h
@@ -52,7 +52,7 @@ namespace Ui
 class AutomatedRssDownloader : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AutomatedRssDownloader)
+    Q_DISABLE_COPY_MOVE(AutomatedRssDownloader)
 
 public:
     explicit AutomatedRssDownloader(QWidget *parent = nullptr);
diff --git a/src/gui/search/pluginselectdialog.h b/src/gui/search/pluginselectdialog.h
index 23e94b963..d5109f4d2 100644
--- a/src/gui/search/pluginselectdialog.h
+++ b/src/gui/search/pluginselectdialog.h
@@ -51,7 +51,7 @@ namespace Ui
 class PluginSelectDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PluginSelectDialog)
+    Q_DISABLE_COPY_MOVE(PluginSelectDialog)
 
 public:
     explicit PluginSelectDialog(SearchPluginManager *pluginManager, QWidget *parent = nullptr);
diff --git a/src/gui/search/pluginsourcedialog.h b/src/gui/search/pluginsourcedialog.h
index 5b62c2f9a..d5d8a1695 100644
--- a/src/gui/search/pluginsourcedialog.h
+++ b/src/gui/search/pluginsourcedialog.h
@@ -40,7 +40,7 @@ namespace Ui
 class PluginSourceDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(PluginSourceDialog)
+    Q_DISABLE_COPY_MOVE(PluginSourceDialog)
 
 public:
     explicit PluginSourceDialog(QWidget *parent = nullptr);
diff --git a/src/gui/search/searchjobwidget.h b/src/gui/search/searchjobwidget.h
index ab8ea6ab7..5e2adba54 100644
--- a/src/gui/search/searchjobwidget.h
+++ b/src/gui/search/searchjobwidget.h
@@ -53,7 +53,7 @@ namespace Ui
 class SearchJobWidget final : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchJobWidget)
+    Q_DISABLE_COPY_MOVE(SearchJobWidget)
 
 public:
     enum class NameFilteringMode
diff --git a/src/gui/search/searchwidget.h b/src/gui/search/searchwidget.h
index 8d9ebebfb..fccd46dc7 100644
--- a/src/gui/search/searchwidget.h
+++ b/src/gui/search/searchwidget.h
@@ -49,7 +49,7 @@ namespace Ui
 class SearchWidget : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchWidget)
+    Q_DISABLE_COPY_MOVE(SearchWidget)
 
 public:
     explicit SearchWidget(MainWindow *mainWindow);
diff --git a/src/gui/speedlimitdialog.h b/src/gui/speedlimitdialog.h
index 25a277cbd..e30e8ea0e 100644
--- a/src/gui/speedlimitdialog.h
+++ b/src/gui/speedlimitdialog.h
@@ -40,7 +40,7 @@ namespace Ui
 class SpeedLimitDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SpeedLimitDialog)
+    Q_DISABLE_COPY_MOVE(SpeedLimitDialog)
 
 public:
     explicit SpeedLimitDialog(QWidget *parent);
diff --git a/src/gui/statsdialog.h b/src/gui/statsdialog.h
index 8b3509841..4f0e890d9 100644
--- a/src/gui/statsdialog.h
+++ b/src/gui/statsdialog.h
@@ -40,7 +40,7 @@ namespace Ui
 class StatsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(StatsDialog)
+    Q_DISABLE_COPY_MOVE(StatsDialog)
 
 public:
   explicit StatsDialog(QWidget *parent);
diff --git a/src/gui/statusbar.h b/src/gui/statusbar.h
index 8961385f7..3cdcae6ec 100644
--- a/src/gui/statusbar.h
+++ b/src/gui/statusbar.h
@@ -41,7 +41,7 @@ namespace BitTorrent
 class StatusBar : public QStatusBar
 {
     Q_OBJECT
-    Q_DISABLE_COPY(StatusBar)
+    Q_DISABLE_COPY_MOVE(StatusBar)
 
 public:
     StatusBar(QWidget *parent = nullptr);
diff --git a/src/gui/torrentcategorydialog.h b/src/gui/torrentcategorydialog.h
index 54d6f0eeb..a4f993cc7 100644
--- a/src/gui/torrentcategorydialog.h
+++ b/src/gui/torrentcategorydialog.h
@@ -38,7 +38,7 @@ namespace Ui
 class TorrentCategoryDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentCategoryDialog)
+    Q_DISABLE_COPY_MOVE(TorrentCategoryDialog)
 
 public:
     static QString createCategory(QWidget *parent, const QString &parentCategoryName = {});
diff --git a/src/gui/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h
index 71473794e..66c816520 100644
--- a/src/gui/torrentcontentmodel.h
+++ b/src/gui/torrentcontentmodel.h
@@ -47,7 +47,7 @@ namespace BitTorrent
 class TorrentContentModel final : public QAbstractItemModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentContentModel)
+    Q_DISABLE_COPY_MOVE(TorrentContentModel)
 
 public:
     enum Roles
diff --git a/src/gui/torrentcontenttreeview.h b/src/gui/torrentcontenttreeview.h
index 9f596dcb3..a6ee2563b 100644
--- a/src/gui/torrentcontenttreeview.h
+++ b/src/gui/torrentcontenttreeview.h
@@ -40,7 +40,7 @@ namespace BitTorrent
 class TorrentContentTreeView final : public QTreeView
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentContentTreeView)
+    Q_DISABLE_COPY_MOVE(TorrentContentTreeView)
 
 public:
     explicit TorrentContentTreeView(QWidget *parent = nullptr);
diff --git a/src/gui/torrentoptionsdialog.h b/src/gui/torrentoptionsdialog.h
index 8ecdb6824..f37d63e0e 100644
--- a/src/gui/torrentoptionsdialog.h
+++ b/src/gui/torrentoptionsdialog.h
@@ -48,7 +48,7 @@ namespace Ui
 class TorrentOptionsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentOptionsDialog)
+    Q_DISABLE_COPY_MOVE(TorrentOptionsDialog)
 
 public:
     explicit TorrentOptionsDialog(QWidget *parent, const QVector<BitTorrent::Torrent *> &torrents);
diff --git a/src/gui/trackerentriesdialog.h b/src/gui/trackerentriesdialog.h
index af1564ce4..f2380f205 100644
--- a/src/gui/trackerentriesdialog.h
+++ b/src/gui/trackerentriesdialog.h
@@ -46,7 +46,7 @@ namespace Ui
 class TrackerEntriesDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TrackerEntriesDialog)
+    Q_DISABLE_COPY_MOVE(TrackerEntriesDialog)
 
 public:
     explicit TrackerEntriesDialog(QWidget *parent);
diff --git a/src/gui/transferlistdelegate.h b/src/gui/transferlistdelegate.h
index c361ff546..1c912db34 100644
--- a/src/gui/transferlistdelegate.h
+++ b/src/gui/transferlistdelegate.h
@@ -35,7 +35,7 @@
 class TransferListDelegate final : public QStyledItemDelegate
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TransferListDelegate)
+    Q_DISABLE_COPY_MOVE(TransferListDelegate)
 
 public:
     explicit TransferListDelegate(QObject *parent);
diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h
index 0d384f216..b47077ead 100644
--- a/src/gui/transferlistfilterswidget.h
+++ b/src/gui/transferlistfilterswidget.h
@@ -52,7 +52,7 @@ namespace Net
 class BaseFilterWidget : public QListWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(BaseFilterWidget)
+    Q_DISABLE_COPY_MOVE(BaseFilterWidget)
 
 public:
     BaseFilterWidget(QWidget *parent, TransferListWidget *transferList);
@@ -76,7 +76,7 @@ private slots:
 class StatusFilterWidget final : public BaseFilterWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(StatusFilterWidget)
+    Q_DISABLE_COPY_MOVE(StatusFilterWidget)
 
 public:
     StatusFilterWidget(QWidget *parent, TransferListWidget *transferList);
@@ -97,7 +97,7 @@ private:
 class TrackerFiltersList final : public BaseFilterWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TrackerFiltersList)
+    Q_DISABLE_COPY_MOVE(TrackerFiltersList)
 
 public:
     TrackerFiltersList(QWidget *parent, TransferListWidget *transferList, bool downloadFavicon);
@@ -143,7 +143,7 @@ class TagFilterWidget;
 class TransferListFiltersWidget final : public QFrame
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TransferListFiltersWidget)
+    Q_DISABLE_COPY_MOVE(TransferListFiltersWidget)
 
 public:
     TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList, bool downloadFavicon);
diff --git a/src/gui/transferlistmodel.h b/src/gui/transferlistmodel.h
index b67a33bf7..dcd52600d 100644
--- a/src/gui/transferlistmodel.h
+++ b/src/gui/transferlistmodel.h
@@ -44,7 +44,7 @@ namespace BitTorrent
 class TransferListModel final : public QAbstractListModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TransferListModel)
+    Q_DISABLE_COPY_MOVE(TransferListModel)
 
 public:
     enum Column
diff --git a/src/gui/transferlistsortmodel.h b/src/gui/transferlistsortmodel.h
index 16dea7d65..46d6cc52a 100644
--- a/src/gui/transferlistsortmodel.h
+++ b/src/gui/transferlistsortmodel.h
@@ -42,7 +42,7 @@ namespace BitTorrent
 class TransferListSortModel final : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TransferListSortModel)
+    Q_DISABLE_COPY_MOVE(TransferListSortModel)
 
 public:
     explicit TransferListSortModel(QObject *parent = nullptr);
diff --git a/src/gui/tristatewidget.h b/src/gui/tristatewidget.h
index a5139ff21..b65a3b541 100644
--- a/src/gui/tristatewidget.h
+++ b/src/gui/tristatewidget.h
@@ -35,7 +35,7 @@ class QString;
 class TriStateWidget final : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TriStateWidget)
+    Q_DISABLE_COPY_MOVE(TriStateWidget)
 
 public:
     TriStateWidget(const QString &text, QWidget *parent);
diff --git a/src/gui/uithememanager.h b/src/gui/uithememanager.h
index 6c23a9f21..becb13b62 100644
--- a/src/gui/uithememanager.h
+++ b/src/gui/uithememanager.h
@@ -38,7 +38,7 @@
 class UIThemeManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(UIThemeManager)
+    Q_DISABLE_COPY_MOVE(UIThemeManager)
 
 public:
     static void initInstance();
diff --git a/src/gui/watchedfolderoptionsdialog.h b/src/gui/watchedfolderoptionsdialog.h
index a5389d5c7..7d6aed296 100644
--- a/src/gui/watchedfolderoptionsdialog.h
+++ b/src/gui/watchedfolderoptionsdialog.h
@@ -41,7 +41,7 @@ namespace Ui
 class WatchedFolderOptionsDialog final : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(WatchedFolderOptionsDialog)
+    Q_DISABLE_COPY_MOVE(WatchedFolderOptionsDialog)
 
 public:
     explicit WatchedFolderOptionsDialog(const TorrentFilesWatcher::WatchedFolderOptions &watchedFolderOptions, QWidget *parent);
diff --git a/src/gui/watchedfoldersmodel.h b/src/gui/watchedfoldersmodel.h
index 166f341b8..dbca62135 100644
--- a/src/gui/watchedfoldersmodel.h
+++ b/src/gui/watchedfoldersmodel.h
@@ -39,7 +39,7 @@
 class WatchedFoldersModel final : public QAbstractListModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(WatchedFoldersModel)
+    Q_DISABLE_COPY_MOVE(WatchedFoldersModel)
 
 public:
     explicit WatchedFoldersModel(TorrentFilesWatcher *fsWatcher, QObject *parent = nullptr);
diff --git a/src/webui/api/apicontroller.h b/src/webui/api/apicontroller.h
index 501781328..9e44163e3 100644
--- a/src/webui/api/apicontroller.h
+++ b/src/webui/api/apicontroller.h
@@ -42,7 +42,7 @@ using StringMap = QHash<QString, QString>;
 class APIController : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(APIController)
+    Q_DISABLE_COPY_MOVE(APIController)
 
 #ifndef Q_MOC_RUN
 #define WEBAPI_PUBLIC
diff --git a/src/webui/api/appcontroller.h b/src/webui/api/appcontroller.h
index 646341eba..93bf1fd7b 100644
--- a/src/webui/api/appcontroller.h
+++ b/src/webui/api/appcontroller.h
@@ -35,7 +35,7 @@
 class AppController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AppController)
+    Q_DISABLE_COPY_MOVE(AppController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/authcontroller.h b/src/webui/api/authcontroller.h
index ae4c84fda..6833a3de0 100644
--- a/src/webui/api/authcontroller.h
+++ b/src/webui/api/authcontroller.h
@@ -38,7 +38,7 @@ class QString;
 class AuthController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AuthController)
+    Q_DISABLE_COPY_MOVE(AuthController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/freediskspacechecker.h b/src/webui/api/freediskspacechecker.h
index 9e5aecfb7..092032bfc 100644
--- a/src/webui/api/freediskspacechecker.h
+++ b/src/webui/api/freediskspacechecker.h
@@ -33,7 +33,7 @@
 class FreeDiskSpaceChecker : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(FreeDiskSpaceChecker)
+    Q_DISABLE_COPY_MOVE(FreeDiskSpaceChecker)
 
 public:
     FreeDiskSpaceChecker() = default;
diff --git a/src/webui/api/logcontroller.h b/src/webui/api/logcontroller.h
index ebf048f9f..2a6cc4b52 100644
--- a/src/webui/api/logcontroller.h
+++ b/src/webui/api/logcontroller.h
@@ -33,7 +33,7 @@
 class LogController final : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(LogController)
+    Q_DISABLE_COPY_MOVE(LogController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/rsscontroller.h b/src/webui/api/rsscontroller.h
index ec94dcbc0..cb58b41f8 100644
--- a/src/webui/api/rsscontroller.h
+++ b/src/webui/api/rsscontroller.h
@@ -33,7 +33,7 @@
 class RSSController final : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(RSSController)
+    Q_DISABLE_COPY_MOVE(RSSController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/searchcontroller.h b/src/webui/api/searchcontroller.h
index 551fa6510..840e695a7 100644
--- a/src/webui/api/searchcontroller.h
+++ b/src/webui/api/searchcontroller.h
@@ -42,7 +42,7 @@ struct SearchResult;
 class SearchController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SearchController)
+    Q_DISABLE_COPY_MOVE(SearchController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/synccontroller.h b/src/webui/api/synccontroller.h
index 35422478a..415ee6421 100644
--- a/src/webui/api/synccontroller.h
+++ b/src/webui/api/synccontroller.h
@@ -41,7 +41,7 @@ class FreeDiskSpaceChecker;
 class SyncController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(SyncController)
+    Q_DISABLE_COPY_MOVE(SyncController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/torrentscontroller.h b/src/webui/api/torrentscontroller.h
index 5a1db8345..419cdd319 100644
--- a/src/webui/api/torrentscontroller.h
+++ b/src/webui/api/torrentscontroller.h
@@ -33,7 +33,7 @@
 class TorrentsController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TorrentsController)
+    Q_DISABLE_COPY_MOVE(TorrentsController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/api/transfercontroller.h b/src/webui/api/transfercontroller.h
index 5b3ce4fb0..3c8891b12 100644
--- a/src/webui/api/transfercontroller.h
+++ b/src/webui/api/transfercontroller.h
@@ -33,7 +33,7 @@
 class TransferController : public APIController
 {
     Q_OBJECT
-    Q_DISABLE_COPY(TransferController)
+    Q_DISABLE_COPY_MOVE(TransferController)
 
 public:
     using APIController::APIController;
diff --git a/src/webui/webapplication.h b/src/webui/webapplication.h
index 6f1a8ad82..2cd3b4634 100644
--- a/src/webui/webapplication.h
+++ b/src/webui/webapplication.h
@@ -72,7 +72,7 @@ class WebApplication final
         , private Http::ResponseBuilder
 {
     Q_OBJECT
-    Q_DISABLE_COPY(WebApplication)
+    Q_DISABLE_COPY_MOVE(WebApplication)
 
 #ifndef Q_MOC_RUN
 #define WEBAPI_PUBLIC
diff --git a/src/webui/webui.h b/src/webui/webui.h
index 098296416..2ebdfbaae 100644
--- a/src/webui/webui.h
+++ b/src/webui/webui.h
@@ -46,7 +46,7 @@ class WebApplication;
 class WebUI : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(WebUI)
+    Q_DISABLE_COPY_MOVE(WebUI)
 
 public:
     WebUI();