From 1d5091e48f6df341dbd4436843c25afe25cbf4ce Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 28 Aug 2014 17:33:47 +0200 Subject: Do not use deprecated Qt functionality. Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller Reviewed-by: hjk --- src/plugins/texteditor/basehoverhandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/texteditor/basehoverhandler.cpp') diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 3b0e5845ab..d382548a10 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -159,12 +159,12 @@ void BaseHoverHandler::process(BaseTextEditor *editor, int pos) void BaseHoverHandler::decorateToolTip() { if (Qt::mightBeRichText(toolTip())) - setToolTip(Qt::escape(toolTip())); + setToolTip(toolTip().toHtmlEscaped()); if (!isDiagnosticTooltip() && lastHelpItemIdentified().isValid()) { const QString &contents = lastHelpItemIdentified().extractContent(false); if (!contents.isEmpty()) { - setToolTip(Qt::escape(toolTip())); + setToolTip(toolTip().toHtmlEscaped()); appendToolTip(contents); addF1ToToolTip(); } -- cgit v1.2.1