diff options
| author | hjk <hjk@qt.io> | 2022-12-20 15:57:07 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-01-12 10:52:07 +0000 |
| commit | 5d7aaf28cb9989392bd5661d1de5dff71b707129 (patch) | |
| tree | 6edf2c1a364f08fef0deaba07630719116823b54 | |
| parent | 516f1f12b6fb16f9c019b0a36fdd1c202dac5ae8 (diff) | |
CPlusPlus: Work around Qt SiC breakage
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>
(cherry picked from commit be89f99ecc631431c15df970112f909eb38114d2)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 836e2ad05b..49f1ac59f3 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1106,7 +1106,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()) m_client->stopExpandingMacro(idTk.byteOffset, *macro); |