From ca6456fe971e9a6270c01c22bcbc39a91e583aa8 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Sun, 17 Feb 2019 17:45:23 -0500
Subject: Backport: Bug [#1548]. Implement calltips on Qt.

Backport of changeset 7237:a82b87a88556 and 7238:ba336ac439f0.
---
 doc/ScintillaDoc.html     | 2 --
 doc/ScintillaHistory.html | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index fdf1e36c0..e897060ae 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -4975,8 +4975,6 @@ struct Sci_TextToFind {
     There is some interaction between call tips and autocompletion lists in that showing a
     call tip cancels any active autocompletion list, and vice versa.</p>
 
-    <p>Call tips are not implemented on Qt.</p>
-
     <p>Call tips can highlight part of the text within them. You could use this to highlight the
     current argument to a function by counting the number of commas (or whatever separator your
     language uses). See <code>SciTEBase::CharAdded()</code> in <code>SciTEBase.cxx</code> for an
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index bf31ff711..7ede2b761 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -530,6 +530,7 @@
 	<td>Gokul Krishnan</td>
       </tr><tr>
 	<td>Jad Altahan</td>
+	<td>Andrea Ricchi</td>
     </tr>
     </table>
     <p>
@@ -548,6 +549,10 @@
 	<li>
 	Released 10 January 2019.
 	</li>
+	<li>
+	Calltips implemented on Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1548/">Bug #1548</a>.
+	</li>
  	<li>
 	The C++ lexer, with styling.within.preprocessor on, now interprets "(" in preprocessor "#if("
 	as an operator instead of part of the directive. This improves folding as well which could become
-- 
cgit v1.2.3