diff options
author | Robert Löhning <robert.loehning@qt.io> | 2022-09-08 21:14:14 +0200 |
---|---|---|
committer | Robert Löhning <robert.loehning@qt.io> | 2022-09-12 08:41:49 +0000 |
commit | 1634a0815f51b79858fd9e6144e8859a547c0937 (patch) | |
tree | fd2c921180063afa80d1bbef4b74cf12674cdf77 /src | |
parent | db54bd078809b19d6d6f0f78b6240783cabb59d4 (diff) |
Remove outdated version checks
Change-Id: I4a76da49b0457afcd97375c121077256db1f65cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/container_qpainter.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/container_qpainter.cpp b/src/container_qpainter.cpp index 07d52ae..f175bce 100644 --- a/src/container_qpainter.cpp +++ b/src/container_qpainter.cpp @@ -23,7 +23,6 @@ #include <QUrl> #include <algorithm> -#include <set> const int kDragDistance = 5; @@ -34,14 +33,6 @@ namespace { static Q_LOGGING_CATEGORY(log, "qlitehtml", QtCriticalMsg) } -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -namespace Qt { -namespace { -auto constexpr SkipEmptyParts = QString::SkipEmptyParts; -} -} -#endif - static QFont toQFont(litehtml::uint_ptr hFont) { return *reinterpret_cast<Font *>(hFont); @@ -467,28 +458,7 @@ litehtml::uint_ptr DocumentContainerPrivate::create_font(const litehtml::tchar_t return name; }); auto font = new QFont(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) font->setFamilies(familyNames); -#else - struct CompareCaseinsensitive - { - bool operator()(const QString &a, const QString &b) const - { - return a.compare(b, Qt::CaseInsensitive) < 0; - } - }; - static const QStringList known = QFontDatabase().families(); - static const std::set<QString, CompareCaseinsensitive> knownFamilies(known.cbegin(), - known.cend()); - font->setFamily(familyNames.last()); - for (const QString &name : qAsConst(familyNames)) { - const auto found = knownFamilies.find(name); - if (found != knownFamilies.end()) { - font->setFamily(*found); - break; - } - } -#endif font->setPixelSize(size); font->setWeight(cssWeightToQtWeight(weight)); font->setStyle(toQFontStyle(italic)); |