diff --git a/.travis.yml b/.travis.yml index 791ac54eb18..40ae0c87220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ install: # Build flags common to OS X and Linux. # Parallel builds are important for avoiding OSX build timeouts. # We turn off verbose output to avoid going over the 4MB output limit. - - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" + - export COMMON="-j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" ##### # Ubuntu Trusty Build diff --git a/src/controllers/controllerdebug.h b/src/controllers/controllerdebug.h index 062240528e1..493b25c95ea 100644 --- a/src/controllers/controllerdebug.h +++ b/src/controllers/controllerdebug.h @@ -34,7 +34,7 @@ class ControllerDebug { // In order of Bug #1797746, since transition to qt5 it is needed unquote the // output for mixxx.log with .noquote(), because in qt5 QDebug() is quoted by default. -#if QT_VERSION > 0x050399 +#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) #define controllerDebug(stream) \ { \ diff --git a/src/util/logging.cpp b/src/util/logging.cpp index 3a6d6af2d63..588a8fef642 100644 --- a/src/util/logging.cpp +++ b/src/util/logging.cpp @@ -14,10 +14,7 @@ #include #include #include - -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) #include -#endif #include "controllers/controllerdebug.h" #include "util/assert.h" @@ -198,7 +195,6 @@ void Logging::initialize(const QDir& settingsDir, // Install the Qt message handler. qInstallMessageHandler(MessageHandler); -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) // Ugly hack around distributions disabling debugging in Qt applications. // This restores the default Qt behavior. It is required for getting useful // logs from users and for developing controller mappings. @@ -207,7 +203,6 @@ void Logging::initialize(const QDir& settingsDir, // Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1731646 QLoggingCategory::setFilterRules("*.debug=true\n" "qt.*.debug=false"); -#endif } // static diff --git a/src/util/widgethider.cpp b/src/util/widgethider.cpp index 0ecf7958c38..2ef3030e2e3 100644 --- a/src/util/widgethider.cpp +++ b/src/util/widgethider.cpp @@ -6,25 +6,6 @@ WidgetHider::WidgetHider(QObject* parent) : QObject(parent) { } -#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) -bool WidgetHider::eventFilter(QObject*, QEvent* ev) { - return ev->type() == QEvent::Paint; -} - -void WidgetHider::retainSizeFor(QWidget* widget) { - Q_UNUSED(widget); -} - -void WidgetHider::hideWidget(QWidget* w) { - w->installEventFilter(this); - w->update(); -} - -void WidgetHider::showWidget(QWidget* w) { - w->removeEventFilter(this); - w->update(); -} -#else bool WidgetHider::eventFilter(QObject* watched, QEvent* event) { return QObject::eventFilter(watched,event); } @@ -44,4 +25,3 @@ void WidgetHider::showWidget(QWidget* widget) { widget->setVisible(true); } -#endif