diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-10-04 11:06:05 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-10-04 11:06:05 +0200 |
| commit | 677c73263f434d1564695a8128d75fefd1a7b50b (patch) | |
| tree | 58d9032b650e88bec1deecee82a30ea257ace7f6 | |
| parent | c16813c5209f0421ec773a98cf935a2eb2ea3d7c (diff) | |
| download | libquotient-677c73263f434d1564695a8128d75fefd1a7b50b.tar.gz libquotient-677c73263f434d1564695a8128d75fefd1a7b50b.zip | |
Drop old compatibility code
libQuotient 0.7 really requires Qt 5.12, nothing earlier will work.
| -rw-r--r-- | lib/qt_connection_util.h | 5 | ||||
| -rw-r--r-- | lib/util.cpp | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h index 9370d2eb..ffefb2a2 100644 --- a/lib/qt_connection_util.h +++ b/lib/qt_connection_util.h @@ -19,12 +19,7 @@ namespace _impl { decorated_slot_tt<ArgTs...> decoratedSlot, Qt::ConnectionType connType) { - // See https://bugreports.qt.io/browse/QTBUG-60339 -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - auto pc = std::make_shared<QMetaObject::Connection>(); -#else auto pc = std::make_unique<QMetaObject::Connection>(); -#endif auto& c = *pc; // Resolve a reference before pc is moved to lambda // Perfect forwarding doesn't work through signal-slot connections - diff --git a/lib/util.cpp b/lib/util.cpp index 993152dd..2dfb09a6 100644 --- a/lib/util.cpp +++ b/lib/util.cpp @@ -14,9 +14,6 @@ static const auto RegExpOptions = QRegularExpression::CaseInsensitiveOption -#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) - | QRegularExpression::OptimizeOnFirstUsageOption // Default since 5.12 -#endif | QRegularExpression::UseUnicodePropertiesOption; // Converts all that looks like a URL into HTML links |