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

Merge remote-tracking branch 'origin/qds/dev'

Browse Source 
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e
This commit is contained in:
Tim Jenssen
2024-04-23 14:36:48 +02:00
parent d9c8590c5f 7dfa746920
commit ef0ee52bf9
718 changed files with 20624 additions and 11600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/texteditor.cpp
View File

@@ -4975,7 +4975,7 @@ static QColor calcBlendColor(const QColor &baseColor, int level, int count)
if (level == count - 1)
return color90;
const int blendFactor = level * (256 / (count - 2));
const int blendFactor = level * (256 / (count - 1));
return blendColors(color80, color90, blendFactor);
}
@@ -7471,8 +7471,7 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
}
}
} else if (typingSettings.m_smartBackspaceBehavior == TypingSettings::BackspaceUnindents) {
const QChar previousChar = q->document()->characterAt(pos - 1);
if (!(previousChar == QLatin1Char(' ') || previousChar == QLatin1Char('\t'))) {
if (c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) {
if (cursorWithinSnippet)
c.beginEditBlock();
c.deletePreviousChar();