From d5d946dd660c14c82dc0e633df010e5af91f02a0 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 26 Apr 2017 08:53:47 +0300 Subject: [PATCH 1/2] Drop Qt4 related settings from QMake project --- macxconf.pri | 3 --- os2conf.pri | 3 --- qm_gen.pri | 5 +---- src/src.pro | 5 +---- unixconf.pri | 3 --- winconf-mingw.pri | 3 --- 6 files changed, 2 insertions(+), 20 deletions(-) diff --git a/macxconf.pri b/macxconf.pri index 36a65930b..09dd13a82 100644 --- a/macxconf.pri +++ b/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 diff --git a/os2conf.pri b/os2conf.pri index 469a5a3e9..c27a9e77e 100644 --- a/os2conf.pri +++ b/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) diff --git a/qm_gen.pri b/qm_gen.pri index 54544407e..ae9d73e86 100644 --- a/qm_gen.pri +++ b/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 } } diff --git a/src/src.pro b/src/src.pro index 8cf3b594e..9a296d258 100644 --- a/src/src.pro +++ b/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 diff --git a/unixconf.pri b/unixconf.pri index 27166909a..5ae018eac 100644 --- a/unixconf.pri +++ b/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 diff --git a/winconf-mingw.pri b/winconf-mingw.pri index 465e4cc98..de56bda16 100644 --- a/winconf-mingw.pri +++ b/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 From 335443e6a0ec09e77cf7efa7647fbd2fc5e99a8c Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 26 Apr 2017 08:58:43 +0300 Subject: [PATCH 2/2] Drop QThread::msleep wrapper --- src/app/main.cpp | 3 ++- src/base/utils/misc.cpp | 19 ------------------- src/base/utils/misc.h | 2 -- src/gui/properties/propertieswidget.cpp | 3 ++- src/gui/properties/speedwidget.cpp | 4 ++-- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 09ccd680a..7defc5293 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -31,6 +31,7 @@ #include #include +#include #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; diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 800b22c30..79871e80b 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -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 diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 3129e0564..856ca52b2 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -98,8 +98,6 @@ namespace Utils QList intListfromStringList(const QStringList &l); QList boolListfromStringList(const QStringList &l); - void msleep(unsigned long msecs); - #ifndef DISABLE_GUI void openPath(const QString& absolutePath); void openFolderSelect(const QString& absolutePath); diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 5804a53f9..77466c748 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #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; } } diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp index 44f4e2767..9b159da24 100644 --- a/src/gui/properties/speedwidget.cpp +++ b/src/gui/properties/speedwidget.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -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); } }