feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Drop Qt5: CorePlugin: Remove code below Qt 6.0.0

Browse Source 
Change-Id: Ib00643f43ae1dfa42ae7ce6b4275fd50dd572765
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-25 09:36:45 +02:00
parent 756f1ddafc
commit 3daec60eb3
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -122,18 +122,12 @@ static QKeySequence keySequenceFromEditString(const QString &editString)
return QKeySequence::fromString(text, QKeySequence::PortableText); 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) static bool keySequenceIsValid(const QKeySequence &sequence)
{ {
if (sequence.isEmpty()) if (sequence.isEmpty())
return false; return false;
for (int i = 0; i < sequence.count(); ++i) { 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 false;
} }
return true; return true;

4
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1427,11 +1427,7 @@ public:
// with the last pixel visible // with the last pixel visible
if (fmt.property(QTextFormat::HeadingLevel) == 2) { if (fmt.property(QTextFormat::HeadingLevel) == 2) {
QTextCharFormat charFmt = currentBlock().charFormat(); QTextCharFormat charFmt = currentBlock().charFormat();
#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
charFmt.setVerticalAlignment(QTextCharFormat::AlignSuperScript);
#else
charFmt.setBaselineOffset(15); charFmt.setBaselineOffset(15);
#endif
setFormat(0, text.length(), charFmt); setFormat(0, text.length(), charFmt);
if (h2Brush.style() == Qt::NoBrush) { if (h2Brush.style() == Qt::NoBrush) {