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/valgrind/memcheckerrorview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/valgrind/memcheckerrorview.cpp') diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index a5782a3985..b1c3a94fb3 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -168,7 +168,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo, if (frame.line() != -1) path += QLatin1Char(':') + QString::number(frame.line()); - path = Qt::escape(path); + path = path.toHtmlEscaped(); if (link && !f.isEmpty() && QFile::exists(fullPath)) { // make a hyperlink label @@ -177,7 +177,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo, } if (!fn.isEmpty()) - return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(Qt::escape(fn), path); + return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(fn.toHtmlEscaped(), path); if (!path.isEmpty()) return path; return QString::fromLatin1("0x%1").arg(frame.instructionPointer(), 0, 16); -- cgit v1.2.1