From ace8a093d262152a7166a0105d47d1cd3c8996e1 Mon Sep 17 00:00:00 2001
From: "Vladimir Golovnev (Glassez)" <glassez@yandex.ru>
Date: Sat, 2 May 2020 14:45:26 +0300
Subject: [PATCH] QMake: Include all GUI sources in "gui.pri"

---
 src/gui/gui.pri                             | 47 +++++++++++++++++++--
 src/gui/powermanagement/powermanagement.pri |  7 ---
 src/gui/properties/properties.pri           | 36 ----------------
 src/gui/qtnotify/qtnotify.pri               |  2 -
 4 files changed, 43 insertions(+), 49 deletions(-)
 delete mode 100644 src/gui/powermanagement/powermanagement.pri
 delete mode 100644 src/gui/properties/properties.pri
 delete mode 100644 src/gui/qtnotify/qtnotify.pri

diff --git a/src/gui/gui.pri b/src/gui/gui.pri
index 28ed64806..81d117dff 100644
--- a/src/gui/gui.pri
+++ b/src/gui/gui.pri
@@ -1,9 +1,5 @@
 INCLUDEPATH += $$PWD
 
-include(powermanagement/powermanagement.pri)
-include(properties/properties.pri)
-unix:!macx:dbus: include(qtnotify/qtnotify.pri)
-
 HEADERS += \
     $$PWD/aboutdialog.h \
     $$PWD/addnewtorrentdialog.h \
@@ -27,10 +23,25 @@ HEADERS += \
     $$PWD/log/logmodel.h \
     $$PWD/mainwindow.h \
     $$PWD/optionsdialog.h \
+    $$PWD/powermanagement/powermanagement.h \
     $$PWD/previewlistdelegate.h \
     $$PWD/previewselectdialog.h \
     $$PWD/private/fspathedit_p.h \
     $$PWD/private/tristatewidget.h \
+    $$PWD/properties/downloadedpiecesbar.h \
+    $$PWD/properties/peerlistdelegate.h \
+    $$PWD/properties/peerlistsortmodel.h \
+    $$PWD/properties/peerlistwidget.h \
+    $$PWD/properties/peersadditiondialog.h \
+    $$PWD/properties/pieceavailabilitybar.h \
+    $$PWD/properties/piecesbar.h \
+    $$PWD/properties/propertieswidget.h \
+    $$PWD/properties/proplistdelegate.h \
+    $$PWD/properties/proptabbar.h \
+    $$PWD/properties/speedplotview.h \
+    $$PWD/properties/speedwidget.h \
+    $$PWD/properties/trackerlistwidget.h \
+    $$PWD/properties/trackersadditiondialog.h \
     $$PWD/raisedmessagebox.h \
     $$PWD/rss/articlelistwidget.h \
     $$PWD/rss/automatedrssdownloader.h \
@@ -93,10 +104,25 @@ SOURCES += \
     $$PWD/log/logmodel.cpp \
     $$PWD/mainwindow.cpp \
     $$PWD/optionsdialog.cpp \
+    $$PWD/powermanagement/powermanagement.cpp \
     $$PWD/previewlistdelegate.cpp \
     $$PWD/previewselectdialog.cpp \
     $$PWD/private/fspathedit_p.cpp \
     $$PWD/private/tristatewidget.cpp \
+    $$PWD/properties/downloadedpiecesbar.cpp \
+    $$PWD/properties/peerlistdelegate.cpp \
+    $$PWD/properties/peerlistsortmodel.cpp \
+    $$PWD/properties/peerlistwidget.cpp \
+    $$PWD/properties/peersadditiondialog.cpp \
+    $$PWD/properties/pieceavailabilitybar.cpp \
+    $$PWD/properties/piecesbar.cpp \
+    $$PWD/properties/propertieswidget.cpp \
+    $$PWD/properties/proplistdelegate.cpp \
+    $$PWD/properties/proptabbar.cpp \
+    $$PWD/properties/speedplotview.cpp \
+    $$PWD/properties/speedwidget.cpp \
+    $$PWD/properties/trackerlistwidget.cpp \
+    $$PWD/properties/trackersadditiondialog.cpp \
     $$PWD/raisedmessagebox.cpp \
     $$PWD/rss/articlelistwidget.cpp \
     $$PWD/rss/automatedrssdownloader.cpp \
@@ -141,6 +167,16 @@ win32|macx {
     SOURCES += $$PWD/programupdater.cpp
 }
 
+unix:!macx:dbus {
+    HEADERS += \
+        $$PWD/powermanagement/powermanagement_x11.h \
+        $$PWD/qtnotify/notifications.h
+        
+    SOURCES += \
+        $$PWD/powermanagement/powermanagement_x11.cpp \
+        $$PWD/qtnotify/notifications.cpp
+}
+
 macx {
     HEADERS += $$PWD/macutilities.h
     OBJECTIVE_SOURCES += $$PWD/macutilities.mm
@@ -159,6 +195,9 @@ FORMS += \
     $$PWD/mainwindow.ui \
     $$PWD/optionsdialog.ui \
     $$PWD/previewselectdialog.ui \
+    $$PWD/properties/peersadditiondialog.ui \
+    $$PWD/properties/propertieswidget.ui \
+    $$PWD/properties/trackersadditiondialog.ui \
     $$PWD/rss/automatedrssdownloader.ui \
     $$PWD/rss/rsswidget.ui \
     $$PWD/search/pluginselectdialog.ui \
diff --git a/src/gui/powermanagement/powermanagement.pri b/src/gui/powermanagement/powermanagement.pri
deleted file mode 100644
index 288e7d66d..000000000
--- a/src/gui/powermanagement/powermanagement.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-HEADERS += $$PWD/powermanagement.h
-SOURCES += $$PWD/powermanagement.cpp
-
-unix:!macx:dbus {
-  HEADERS += $$PWD/powermanagement_x11.h
-  SOURCES += $$PWD/powermanagement_x11.cpp
-}
diff --git a/src/gui/properties/properties.pri b/src/gui/properties/properties.pri
deleted file mode 100644
index 7670b5e33..000000000
--- a/src/gui/properties/properties.pri
+++ /dev/null
@@ -1,36 +0,0 @@
-FORMS += \
-    $$PWD/peersadditiondialog.ui \
-    $$PWD/propertieswidget.ui \
-    $$PWD/trackersadditiondialog.ui
-
-HEADERS += \
-    $$PWD/downloadedpiecesbar.h \
-    $$PWD/peerlistdelegate.h \
-    $$PWD/peerlistsortmodel.h \
-    $$PWD/peerlistwidget.h \
-    $$PWD/peersadditiondialog.h \
-    $$PWD/pieceavailabilitybar.h \
-    $$PWD/piecesbar.h \
-    $$PWD/propertieswidget.h \
-    $$PWD/proplistdelegate.h \
-    $$PWD/proptabbar.h \
-    $$PWD/speedplotview.h \
-    $$PWD/speedwidget.h \
-    $$PWD/trackerlistwidget.h \
-    $$PWD/trackersadditiondialog.h
-
-SOURCES += \
-    $$PWD/downloadedpiecesbar.cpp \
-    $$PWD/peerlistdelegate.cpp \
-    $$PWD/peerlistsortmodel.cpp \
-    $$PWD/peerlistwidget.cpp \
-    $$PWD/peersadditiondialog.cpp \
-    $$PWD/pieceavailabilitybar.cpp \
-    $$PWD/piecesbar.cpp \
-    $$PWD/propertieswidget.cpp \
-    $$PWD/proplistdelegate.cpp \
-    $$PWD/proptabbar.cpp \
-    $$PWD/speedplotview.cpp \
-    $$PWD/speedwidget.cpp \
-    $$PWD/trackerlistwidget.cpp \
-    $$PWD/trackersadditiondialog.cpp
diff --git a/src/gui/qtnotify/qtnotify.pri b/src/gui/qtnotify/qtnotify.pri
deleted file mode 100644
index c0b99829c..000000000
--- a/src/gui/qtnotify/qtnotify.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += $$PWD/notifications.h
-SOURCES += $$PWD/notifications.cpp