diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-06 17:41:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-06 17:57:12 +0000 |
| commit | 71ec67a0fd8aa8d9caab743647c2fdd4385c3e19 (patch) | |
| tree | 25f541805067ffaf0d1a6365c19aac7eaf295551 /src/network/access/qftp.cpp | |
| parent | 03bcf389c0b525919b82a64ab5290189f2994846 (diff) | |
| parent | 19dd2ca93b8b95a5e2792b29ed62ea23800fb53e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/network/access/qftp.cpp')
| -rw-r--r-- | src/network/access/qftp.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 47579ba654..762ef00225 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -43,8 +43,6 @@ #include "private/qftp_p.h" #include "qabstractsocket.h" -#ifndef QT_NO_FTP - #include "qcoreapplication.h" #include "qtcpsocket.h" #include "qurlinfo_p.h" @@ -2453,5 +2451,3 @@ QT_END_NAMESPACE #include "qftp.moc" #include "moc_qftp_p.cpp" - -#endif // QT_NO_FTP |