diff options
| author | John Ehresman <unknown> | 2022-05-11 10:13:18 +1000 |
|---|---|---|
| committer | John Ehresman <unknown> | 2022-05-11 10:13:18 +1000 |
| commit | 74962c0e091f966425307e162c2085f3b9ed5fef (patch) | |
| tree | 26bf81287d6fb748f6fbca241efbbbff2d538970 | |
| parent | c205c349ea3e7135d1da5c15831dbe687842453b (diff) | |
| download | scintilla-mirror-74962c0e091f966425307e162c2085f3b9ed5fef.tar.gz | |
Bug [#2328]. For Qt 6.x, ensure QByteArray created when text is null but
length is non-0.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 066e18af0..772fea3d8 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -600,6 +600,10 @@ Fix ARM64 builds with Visual C++ due to unsupported CETCOMPAT flag. <a href="https://sourceforge.net/p/scintilla/bugs/2324/">Bug #2324</a>. </li> + <li> + For Qt 6, fix "modified" signal when text is null but length non-0. + <a href="https://sourceforge.net/p/scintilla/bugs/2328/">Bug #2328</a>. + </li> </ul> <h3> <a href="https://www.scintilla.org/scintilla522.zip">Release 5.2.2</a> diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index edee70032..c390f4039 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -739,7 +739,7 @@ void ScintillaEditBase::notifyParent(NotificationData scn) emit linesAdded(added ? 1 : -1); } - const QByteArray bytes = QByteArray::fromRawData(scn.text, scn.length); + const QByteArray bytes = QByteArray::fromRawData(scn.text, scn.text ? scn.length : 0); emit modified(scn.modificationType, scn.position, scn.length, scn.linesAdded, bytes, scn.line, scn.foldLevelNow, scn.foldLevelPrev); |