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

Fix build with Qt6

Browse Source 
Some type issues (int vs long long, int vs QFont::Weight), no "midRef" any more.

Task-number: QTCREATORBUG-24098
Change-Id: Id39f70edc14832baaeebb2572bca5491deadaf1d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Eike Ziller
2021-01-21 13:26:26 +01:00
parent c8e8285ff0
commit f1f3881cdb
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.cpp
View File

@@ -291,8 +291,9 @@ void ActivationSequenceContextProcessor::goBackToStartOfName()
const int tokIndex = CPlusPlus::SimpleLexer::tokenAt(tokens, tokenPos);
if (tokIndex > -1 && tokens.at(tokIndex).isStringLiteral()) {
const int tokenStart = tokens.at(tokIndex).utf16charOffset;
const int slashIndex = m_textCursor.block().text().lastIndexOf('/',
std::min(m_textCursor.positionInBlock(), m_textCursor.block().text().length() - 1));
const int slashIndex = m_textCursor.block().text().lastIndexOf(
'/',
std::min(m_textCursor.positionInBlock(), int(m_textCursor.block().text().length() - 1)));
m_startOfNamePosition = m_textCursor.block().position() + std::max(slashIndex, tokenStart)
+ 1;
} else {