diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 6fb9b4c8f..05b02148d 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -442,6 +442,7 @@ <td>Ebben</td> </tr><tr> <td>Robert Gieseke</td> + <td>Mike M</td> </tr> </table> <p> @@ -471,6 +472,10 @@ Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs. </li> <li> + Fix Qt bug where double click treated as triple click. + <a href="http://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>. + </li> + <li> Fix bug on Windows when resizing autocompletion list with only short strings caused the list to move. </li> </ul> diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 2e7afa149..4677e3536 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -310,11 +310,17 @@ void ScintillaEditBase::mouseReleaseEvent(QMouseEvent *event) emit buttonReleased(event); } +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) void ScintillaEditBase::mouseDoubleClickEvent(QMouseEvent *event) { // Scintilla does its own double-click detection. mousePressEvent(event); } +#else +void ScintillaEditBase::mouseDoubleClickEvent(QMouseEvent *) +{ +} +#endif void ScintillaEditBase::mouseMoveEvent(QMouseEvent *event) { |