Merge pull request #6693 from glassez/drop-qt4

Drop rest of qt4 support code

macxconf.pri

@@ -11,9 +11,6 @@ exists($$OUT_PWD/../conf.pri) {
 
 LIBS += -framework Carbon -framework IOKit
 
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
-
 QT_LANG_PATH = ../dist/qt-translations
 DIST_PATH = ../dist/mac
 

os2conf.pri

@@ -1,6 +1,3 @@
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
-
 exists(conf.pri) {
     # to the conf.pri goes all system dependent stuff
     include(conf.pri)

qm_gen.pri

@@ -1,13 +1,10 @@
 TS_IN = $$fromfile(src/src.pro,TRANSLATIONS)
 TS_IN_NOEXT = $$replace(TS_IN,".ts","")
-             
+
 isEmpty(QMAKE_LRELEASE) {
     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
     unix {
-      equals(QT_MAJOR_VERSION, 4) {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
-      } 
       equals(QT_MAJOR_VERSION, 5) {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
       }

src/app/main.cpp

@@ -31,6 +31,7 @@
 
 #include <QDebug>
 #include <QScopedPointer>
+#include <QThread>
 
 #ifndef DISABLE_GUI
 // GUI-only includes
@@ -168,7 +169,7 @@ int main(int argc, char *argv[])
 #endif
             qDebug("qBittorrent is already running for this user.");
 
-            Utils::Misc::msleep(300);
+            QThread::msleep(300);
             app->sendParams(params.torrents);
 
             return EXIT_SUCCESS;

src/base/utils/misc.cpp

@@ -36,7 +36,6 @@
 #include <QDebug>
 #include <QProcess>
 #include <QRegularExpression>
-#include <QThread>
 #include <QSysInfo>
 #include <boost/version.hpp>
 #include <libtorrent/version.hpp>
@@ -641,24 +640,6 @@ QSize Utils::Misc::largeIconSize()
 }
 #endif // DISABLE_GUI
 
-namespace
-{
-    //  Trick to get a portable sleep() function
-    class SleeperThread: public QThread
-    {
-    public:
-        static void msleep(unsigned long msecs)
-        {
-            QThread::msleep(msecs);
-        }
-    };
-}
-
-void Utils::Misc::msleep(unsigned long msecs)
-{
-    SleeperThread::msleep(msecs);
-}
-
 QString Utils::Misc::osName()
 {
     // static initialization for usage in signal handler

src/base/utils/misc.h

@@ -98,8 +98,6 @@ namespace Utils
         QList<int> intListfromStringList(const QStringList &l);
         QList<bool> boolListfromStringList(const QStringList &l);
 
-        void msleep(unsigned long msecs);
-
 #ifndef DISABLE_GUI
         void openPath(const QString& absolutePath);
         void openFolderSelect(const QString& absolutePath);

src/gui/properties/propertieswidget.cpp

@@ -41,6 +41,7 @@
 #include <QMenu>
 #include <QFileDialog>
 #include <QBitArray>
+#include <QThread>
 
 #include "base/bittorrent/session.h"
 #include "base/preferences.h"
@@ -780,7 +781,7 @@ void PropertiesWidget::renameSelectedFile()
             int timeout = 10;
             while (!QDir().rmpath(old_folder.absolutePath()) && timeout > 0) {
                 // FIXME: We should not sleep here (freezes the UI for 1 second)
-                Utils::Misc::msleep(100);
+                QThread::msleep(100);
                 --timeout;
             }
         }

src/gui/properties/speedwidget.cpp

@@ -33,6 +33,7 @@
 #include <QLabel>
 #include <QMenu>
 #include <QSignalMapper>
+#include <QThread>
 
 #include <libtorrent/session_status.hpp>
 
@@ -40,7 +41,6 @@
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/sessionstatus.h"
 #include "base/preferences.h"
-#include "base/utils/misc.h"
 
 ComboBoxMenuButton::ComboBoxMenuButton(QWidget *parent, QMenu *menu)
     : QComboBox(parent)
@@ -152,7 +152,7 @@ void SpeedWidget::update()
         m_plot->pushPoint(point);
 
         QMetaObject::invokeMethod(this, "graphUpdate", Qt::QueuedConnection);
-        Utils::Misc::msleep(1000);
+        QThread::msleep(1000);
     }
 }
 

src/src.pro

@@ -6,8 +6,6 @@ CONFIG += qt thread silent
 CONFIG += c++11
 DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
 
-lessThan(QT_MAJOR_VERSION, 5): DEFINES += QStringLiteral=QLatin1String
-
 # Windows specific configuration
 win32: include(../winconf.pri)
 
@@ -25,8 +23,7 @@ nogui {
     DEFINES += DISABLE_GUI
     TARGET = qbittorrent-nox
 } else {
-    QT += xml
-    greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent widgets
+    QT += xml concurrent widgets
     CONFIG(static) {
         DEFINES += QBT_STATIC_QT
         QTPLUGIN += qico

unixconf.pri

@@ -9,9 +9,6 @@ exists($$OUT_PWD/../conf.pri) {
     include(conf.pri)
 }
 
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
-
 # COMPILATION SPECIFIC
 !nogui:dbus: QT += dbus
 

winconf-mingw.pri

@@ -1,6 +1,3 @@
-# C++11 support
-lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=gnu++11
-
 strace_win{
   contains(QMAKE_HOST.arch, x86) {
     # i686 arch requires frame pointer preservation