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/qnx/blackberrydebugtokenreader.cpp | |
parent | 7ba0f8a4c42c5db144b599861f38d2e771e0dafe (diff) | |
download | qt-creator-1d5091e48f6df341dbd4436843c25afe25cbf4ce.tar.gz |
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/qnx/blackberrydebugtokenreader.cpp')
-rw-r--r-- | src/plugins/qnx/blackberrydebugtokenreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/blackberrydebugtokenreader.cpp b/src/plugins/qnx/blackberrydebugtokenreader.cpp index 4168e0e50b..97e2b28fd0 100644 --- a/src/plugins/qnx/blackberrydebugtokenreader.cpp +++ b/src/plugins/qnx/blackberrydebugtokenreader.cpp @@ -134,5 +134,5 @@ QString BlackBerryDebugTokenReader::value(const QByteArray &key, const QByteArra { int valueStart = data.indexOf(key) + key.size(); int valueEnd = data.indexOf(QByteArray("\r\n"), valueStart); - return QString::fromAscii(data.mid(valueStart, valueEnd - valueStart)); + return QString::fromLatin1(data.mid(valueStart, valueEnd - valueStart)); } |