diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-29 07:35:23 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-29 07:35:23 (GMT) |
| commit | 71165896c2867091abe6df98ea18ac0536028a0b (patch) | |
| tree | 91e7b1efa84eae456ae3d9b4831f0a0ce7f8bedc /src/network/access/qftp.cpp | |
| parent | e24b4b83fa4e71ab137ac254a9c69fec672d5e66 (diff) | |
| parent | 1f5e2724e788e53ede53a7e9ee4e08f4ad3ccc51 (diff) | |
| download | Qt-71165896c2867091abe6df98ea18ac0536028a0b.zip Qt-71165896c2867091abe6df98ea18ac0536028a0b.tar.gz Qt-71165896c2867091abe6df98ea18ac0536028a0b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/network/access/qftp.cpp')
| -rw-r--r-- | src/network/access/qftp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 7f6df0a..97219f4 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -2311,7 +2311,7 @@ void QFtpPrivate::_q_piError(int errorCode, const QString &text) Q_Q(QFtp); if (pending.isEmpty()) { - qWarning() << "QFtpPrivate::_q_piError was called without pending command!"; + qWarning("QFtpPrivate::_q_piError was called without pending command!"); return; } |