diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/qt-init.cpp | 2 | ||||
| -rw-r--r-- | core/qthelper.h | 16 |
2 files changed, 1 insertions, 17 deletions
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++ |