From 677c73263f434d1564695a8128d75fefd1a7b50b Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 4 Oct 2021 11:06:05 +0200 Subject: Drop old compatibility code libQuotient 0.7 really requires Qt 5.12, nothing earlier will work. --- lib/qt_connection_util.h | 5 ----- lib/util.cpp | 3 --- 2 files changed, 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 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(); -#else auto pc = std::make_unique(); -#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 -- cgit v1.2.3