From 3daec60eb323500d17e479ef3ca5b15cd15c4697 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 25 Jul 2022 09:36:45 +0200 Subject: [PATCH] Drop Qt5: CorePlugin: Remove code below Qt 6.0.0 Change-Id: Ib00643f43ae1dfa42ae7ce6b4275fd50dd572765 Reviewed-by: Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 8 +------- src/plugins/coreplugin/mainwindow.cpp | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 73e6ebe2fc6..976db777405 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -122,18 +122,12 @@ static QKeySequence keySequenceFromEditString(const QString &editString) return QKeySequence::fromString(text, QKeySequence::PortableText); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -using KeyCombination = int; -#else -using KeyCombination = QKeyCombination; -#endif - static bool keySequenceIsValid(const QKeySequence &sequence) { if (sequence.isEmpty()) return false; for (int i = 0; i < sequence.count(); ++i) { - if (sequence[i] == KeyCombination(Qt::Key_unknown)) + if (sequence[i] == QKeyCombination(Qt::Key_unknown)) return false; } return true; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 66c49347386..ae51062df2a 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1427,11 +1427,7 @@ public: // with the last pixel visible if (fmt.property(QTextFormat::HeadingLevel) == 2) { QTextCharFormat charFmt = currentBlock().charFormat(); -#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0) - charFmt.setVerticalAlignment(QTextCharFormat::AlignSuperScript); -#else charFmt.setBaselineOffset(15); -#endif setFormat(0, text.length(), charFmt); if (h2Brush.style() == Qt::NoBrush) {