Merge pull request #6648 from evsh/v3_3_x

CMake 3.8 fixes for v3_3_x branch. Closes #6634.
qbittorrent · Apr 17, 2017 · 4a95291 · 4a95291
2 parents 258efe2 + 6717e3d
commit 4a95291
Show file tree

Hide file tree

Showing 23 changed files with 465 additions and 338 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -132,7 +132,7 @@ shutdownconfirmdlg.ui
 
 qbt_target_sources(about.qrc)
 
-add_library(qbt_gui STATIC ${QBT_GUI_HEADERS} ${QBT_GUI_SOURCES})
+add_library(qbt_gui STATIC ${QBT_GUI_HEADERS} ${QBT_GUI_SOURCES} ${QBT_GUI_FORMS})
 target_link_libraries(qbt_gui qbt_lineedit qbt_powermanagement qbt_rss qbt_properties qbt_searchengine
     ${QBT_GUI_OPTIONAL_LINK_LIBRARIES} qbt_base
     QtSingleApplication::QtSingleApplication

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -28,6 +28,8 @@
  * Contact : chris@qbittorrent.org
  */
 
+#include "mainwindow.h"
+
 #include <QtGlobal>
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && defined(QT_DBUS_LIB)
 #include <QDBusConnection>
@@ -44,6 +46,7 @@
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QScrollBar>
+#include <QSplitter>
 #include <QSysInfo>
 #include <QMimeData>
 #include <QCryptographicHash>
@@ -91,7 +94,6 @@
 #include "executionlog.h"
 #include "hidabletabwidget.h"
 #include "ui_mainwindow.h"
-#include "mainwindow.h"
 
 #ifdef Q_OS_MAC
 void qt_mac_set_dock_menu(QMenu *menu);

diff --git a/src/gui/properties/CMakeLists.txt b/src/gui/properties/CMakeLists.txt
@@ -42,7 +42,7 @@ speedwidget.cpp
 speedplotview.cpp
 )
 
-add_library(qbt_properties STATIC ${QBT_PROPERTIES_HEADERS} ${QBT_PROPERTIES_SOURCES})
+add_library(qbt_properties STATIC ${QBT_PROPERTIES_HEADERS} ${QBT_PROPERTIES_SOURCES} ${QBT_PROPERTIES_FORMS})
 target_link_libraries(qbt_properties qbt_base)
 if (NOT QT4_FOUND)
     target_link_libraries(qbt_properties Qt5::Widgets Qt5::Concurrent)

diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp
@@ -28,6 +28,9 @@
  * Contact : chris@qbittorrent.org
  */
 
+#include "peerlistwidget.h"
+
+#include <QApplication>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <QSet>
@@ -53,7 +56,6 @@
 #include "guiiconprovider.h"
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
-#include "peerlistwidget.h"
 
 PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     : QTreeView(parent)

diff --git a/src/gui/properties/peersadditiondlg.cpp b/src/gui/properties/peersadditiondlg.cpp
@@ -28,23 +28,31 @@
  * Contact : chris@qbittorrent.org
  */
 
+#include "peersadditiondlg.h"
+
 #include <QMessageBox>
 #include <QHostAddress>
 
-#include "peersadditiondlg.h"
+#include "ui_peersadditiondlg.h"
 
 PeersAdditionDlg::PeersAdditionDlg(QWidget *parent)
     : QDialog(parent)
+    , m_ui(new Ui::addPeersDialog())
 {
-    setupUi(this);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(validateInput()));
+    m_ui->setupUi(this);
+    connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(validateInput()));
 
 #ifdef QBT_USES_QT5
-    label_format->hide();
-    peers_txt->setPlaceholderText("Format: IPv4:port / [IPv6]:port");
+    m_ui->label_format->hide();
+    m_ui->peers_txt->setPlaceholderText("Format: IPv4:port / [IPv6]:port");
 #endif
 }
 
+PeersAdditionDlg::~PeersAdditionDlg()
+{
+    delete m_ui;
+}
+
 QList<BitTorrent::PeerAddress> PeersAdditionDlg::askForPeers()
 {
     PeersAdditionDlg dlg;
@@ -54,13 +62,13 @@ QList<BitTorrent::PeerAddress> PeersAdditionDlg::askForPeers()
 
 void PeersAdditionDlg::validateInput()
 {
-    if (peers_txt->toPlainText().trimmed().isEmpty()) {
+    if (m_ui->peers_txt->toPlainText().trimmed().isEmpty()) {
         QMessageBox::warning(this, tr("No peer entered"),
                     tr("Please type at least one peer."),
                     QMessageBox::Ok);
         return;
     }
-    foreach (const QString &peer, peers_txt->toPlainText().trimmed().split("\n")) {
+    foreach (const QString &peer, m_ui->peers_txt->toPlainText().trimmed().split("\n")) {
         BitTorrent::PeerAddress addr = parsePeer(peer);
         if (!addr.ip.isNull()) {
             m_peersList.append(addr);

diff --git a/src/gui/properties/peersadditiondlg.h b/src/gui/properties/peersadditiondlg.h
@@ -34,14 +34,21 @@
 #include <QDialog>
 
 #include "base/bittorrent/peerinfo.h"
-#include "ui_peersadditiondlg.h"
 
-class PeersAdditionDlg: public QDialog, private Ui::addPeersDialog
+template <class T> class QList;
+
+namespace Ui
+{
+    class addPeersDialog;
+}
+
+class PeersAdditionDlg: public QDialog
 {
     Q_OBJECT
 
 public:
     PeersAdditionDlg(QWidget *parent = 0);
+    ~PeersAdditionDlg();
 
     static QList<BitTorrent::PeerAddress> askForPeers();
 
@@ -50,6 +57,8 @@ protected slots:
 
 private:
     BitTorrent::PeerAddress parsePeer(QString peer);
+
+    Ui::addPeersDialog *m_ui;
     QList<BitTorrent::PeerAddress> m_peersList;
 
 };