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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/libs/utils/multitextcursor.cpp

Change-Id: I54b00ea5e6953078beed7673b5de31114f983bfa
This commit is contained in:
Eike Ziller
2023-03-31 15:57:04 +02:00
parent c6565611d6 7046890bcc
commit b635e99086
21 changed files with 351 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/multitextcursor.cpp
View File

@@ -194,7 +194,7 @@ bool MultiTextCursor::hasMultipleCursors() const
int MultiTextCursor::cursorCount() const
{
return m_cursorList.size();
return static_cast<int>(m_cursorList.size());
}
void MultiTextCursor::movePosition(QTextCursor::MoveOperation operation,