summaryrefslogtreecommitdiffstats
path: root/src/network/access/qftp.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-02-23 07:49:33 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2019-02-23 10:19:34 +0000
commit19a9768f1a62366f1bee16a7cb9b3256ef851efe (patch)
tree9d41df69dd52b5f49ae008c9eaf1aca9f53e1e55 /src/network/access/qftp.cpp
parentbdf1c4f671c706832cea84269e91995e85eb9f07 (diff)
parent2a1292b9168d40e71c9e67a41d3b8c499b8e222b (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/access/qftp.cpp')
-rw-r--r--src/network/access/qftp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index d33355c470..4e399f018f 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -1826,8 +1826,8 @@ int QFtp::cd(const QString &dir)
is data available to read. You can then read the data with the
read() or readAll() functions.
- If \a dev is not 0, the data is written directly to the device \a
- dev. Make sure that the \a dev pointer is valid for the duration
+ If \a dev is not \nullptr, the data is written directly to the device
+ \a dev. Make sure that the \a dev pointer is valid for the duration
of the operation (it is safe to delete it when the
commandFinished() signal is emitted). In this case the readyRead()
signal is \e not emitted and you cannot read data with the