diff options
| author | hjk <hjk@qt.io> | 2020-07-29 14:47:28 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-29 14:03:19 +0000 |
| commit | 6c590531b0136bd7e2b16f07e51b566681692124 (patch) | |
| tree | 9bfd519e8de157df9a0dc168462adf837159e0e1 /src/libs/3rdparty/syntax-highlighting/src | |
| parent | 77d13f08ba9e465725d1ca3a677aae949732804b (diff) | |
Small Qt 6 migration stuff
- qsizetype vs int
- QJsonValue vs QJsonValueRef
- #include for metatype system
Task-number: QTCREATORBUG-24098
Change-Id: I066d9e3d5c35766b8aa3adc1c5835b23feb20b37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/src')
| -rw-r--r-- | src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp index 4b4faa956d..dfb4d0c24a 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp @@ -68,7 +68,7 @@ bool StateData::pop(int popCount) // keep the initial context alive in any case Q_ASSERT(!isEmpty()); const bool initialContextSurvived = m_contextStack.size() > popCount; - m_contextStack.resize(std::max(1, m_contextStack.size() - popCount)); + m_contextStack.resize(std::max(1, int(m_contextStack.size()) - popCount)); return initialContextSurvived; } |