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

CPlusPlus: Work around Qt SiC breakage

Browse Source 
Qt Base b6cbd9c43afc7e005c1f78e1d0f700524930ed71 introduced

    #if !defined(QT_STRICT_QLIST_ITERATORS) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) && !defined(Q_OS_WIN)
    #define QT_STRICT_QLIST_ITERATORS
    #endif

removing iterator-to-pointer conversion starting with Qt 6.6 as dev,
i.e. now.

Change-Id: I75f25623917d0e666fb267db70d9701a13b270f2
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-12-20 15:57:07 +01:00
parent 2aff1282c4
commit be89f99ecc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/cplusplus/pp-engine.cpp
View File

@@ -1118,7 +1118,8 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
} }
} }
m_state.pushTokenBuffer(body.constBegin(), body.constEnd(), macro); const PPToken *start = body.constData();
m_state.pushTokenBuffer(start, start + body.size(), macro);
if (m_client && !idTk.generated()) if (m_client && !idTk.generated())
m_client->stopExpandingMacro(idTk.byteOffset, *macro); m_client->stopExpandingMacro(idTk.byteOffset, *macro);