diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-01-06 15:04:16 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-01-06 15:04:16 +1100 |
| commit | 4d75c2a9dc44b0bb8ef8c2bc8ce4424414e8ab9a (patch) | |
| tree | 19f913e172d142959644a9cc51b9b81fa8e10162 | |
| parent | f6e6731598a02121be850a17a12384090b40f1ac (diff) | |
| download | scintilla-mirror-4d75c2a9dc44b0bb8ef8c2bc8ce4424414e8ab9a.tar.gz | |
Backport: Bug [#2147]. Don't clear clipboard before copying text.
Backport of changeset 7926:184f4b475993.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index bb680872c..d15381d79 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -575,6 +575,10 @@ Lexer and folder added for Raku language. <a href="https://sourceforge.net/p/scintilla/feature-requests/1328/">Feature #1328</a>. </li> + <li> + Don't clear clipboard before copying text with Qt. + <a href="https://sourceforge.net/p/scintilla/bugs/2147/">Bug #2147</a>. + </li> </ul> <h3> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.11.2/scintilla3112.zip/download">Release 3.11.2</a> diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 1ad4a84b3..9a2545a38 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -295,7 +295,6 @@ void ScintillaQt::ReconfigureScrollBars() void ScintillaQt::CopyToModeClipboard(const SelectionText &selectedText, QClipboard::Mode clipboardMode_) { QClipboard *clipboard = QApplication::clipboard(); - clipboard->clear(clipboardMode_); QString su = StringFromSelectedText(selectedText); QMimeData *mimeData = new QMimeData(); mimeData->setText(su); |
