mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop support Qt versions before 5.9

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2019-10-14 10:35:45 -07:00
parent cd8e1eb15a
commit d323e9381b
4 changed files with 1 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/qt-init.cpp
View file

@ -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)

16
core/qthelper.h
View file

@ -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++