diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-28 17:33:47 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-29 14:10:41 +0200 |
commit | 1d5091e48f6df341dbd4436843c25afe25cbf4ce (patch) | |
tree | 9151d71b36bcffbba219ef1a0fc4e4f234adbc89 /src/plugins/valgrind/memcheckerrorview.cpp | |
parent | 7ba0f8a4c42c5db144b599861f38d2e771e0dafe (diff) |
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 <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/valgrind/memcheckerrorview.cpp')
-rw-r--r-- | src/plugins/valgrind/memcheckerrorview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index a5782a39858..b1c3a94fb31 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); |