diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 10:35:45 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-14 13:37:17 -0700 |
| commit | d323e9381b17873353a10803d71b80fb57e6bde3 (patch) | |
| tree | 430293de9301ec0f58d35da98773a9fcdf0c6de6 | |
| parent | cd8e1eb15aa23e760a2e7a952652e92433f43a6c (diff) | |
| download | subsurface-d323e9381b17873353a10803d71b80fb57e6bde3.tar.gz | |
Stop support Qt versions before 5.9
There's just no point to testing these outdated versions.
Everything we build is now Qt 5.9 or newer.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | core/qt-init.cpp | 2 | ||||
| -rw-r--r-- | core/qthelper.h | 16 | ||||
| -rw-r--r-- | subsurface-desktop-main.cpp | 10 |
4 files changed, 1 insertions, 48 deletions
diff --git a/.travis.yml b/.travis.yml index 947c52dbd..356c8b665 100644 --- a/.travis.yml +++ b/.travis.yml @@ -130,27 +130,6 @@ matrix: # directories: # - 3pp - - env: SUBSURFACE_PLATFORM="qt55" - os: linux - language: c++ - filter_secrets: false - services: - - docker - -# - env: SUBSURFACE_PLATFORM="qt56" -# os: linux -# language: c++ -# filter_secrets: false -# services: -# - docker - - - env: SUBSURFACE_PLATFORM="qt57" - os: linux - language: c++ - filter_secrets: false - services: - - docker - - env: SUBSURFACE_PLATFORM="qt59" os: linux language: c++ diff --git a/core/qt-init.cpp b/core/qt-init.cpp index b07c905c3..ead7f4654 100644 --- a/core/qt-init.cpp +++ b/core/qt-init.cpp @@ -24,7 +24,7 @@ void init_qt_late() QCoreApplication::setOrganizationName("Subsurface"); QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) QGuiApplication::setDesktopFileName("subsurface"); #endif // enable user specific settings (based on command line argument) diff --git a/core/qthelper.h b/core/qthelper.h index 1322cc9b9..090f4fc6f 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -112,22 +112,6 @@ void moveInVector(Vector &v, int rangeBegin, int rangeEnd, int destination) else if (destination < rangeBegin) std::rotate(it + destination, it + rangeBegin, it + rangeEnd); } - -// Qt overloads some signals(!) which can't therefore be used in connect() calls with -// pointers-to-member functions where the signatures of signal and slot don't match perfectly. -// For this case, Qt 5.7 provides the qOverload<> helper. -// Since we still support Qt 5.5 let's reimplement it here. -#if QT_VERSION < 0x050700 -template <typename... Args> -struct QOverload { - template <typename Ret, typename Class> - static Ret (Class::*of(Ret (Class::*fun)(Args...)))(Args...) - { - return fun; - } -}; -#endif - #endif // 3) Functions visible to C and C++ diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp index 981a62a04..33a424799 100644 --- a/subsurface-desktop-main.cpp +++ b/subsurface-desktop-main.cpp @@ -214,18 +214,8 @@ exit: ctx.makeCurrent(NULL); surface.destroy(); if (glError) { -#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0) - qWarning() << QStringLiteral(VALIDATE_GL_PREFIX - "ERROR: %1.\n" - "Cannot automatically fallback to a software renderer!\n" - "Set the environment variable 'QT_QUICK_BACKEND' with the value of 'software'\n" - "before running Subsurface!\n") - .arg(glError); - exit(0); -#else qWarning() << QStringLiteral(VALIDATE_GL_PREFIX "WARNING: %1. Using a software renderer!").arg(glError); QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); -#endif } } |