diff options
| author |  Szymon Tomasz Stefanek | 2015-08-23 03:08:37 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-23 03:08:37 +0200 |
| commit | 87b89ecbfd83a744854a5e20c96bcd6ee99b2316 (patch) | |
| tree | 086a4b8b85f8ef159fa08ec78120fc9a2d389c02 /src/modules/objects/KvsObject_ftp.cpp | |
| parent | Port KVS http class to Qt5 (diff) | |
| download | KVIrc-87b89ecbfd83a744854a5e20c96bcd6ee99b2316.tar.gz KVIrc-87b89ecbfd83a744854a5e20c96bcd6ee99b2316.tar.bz2 KVIrc-87b89ecbfd83a744854a5e20c96bcd6ee99b2316.zip | |
Port KVS ftp class to Qt5
Diffstat (limited to 'src/modules/objects/KvsObject_ftp.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_ftp.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index 7401facc4..2b099afc3 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -24,17 +24,21 @@ #include "KvsObject_ftp.h" -#ifdef __GNUC__ -#warning "QFtp doesn't exist anymore in Qt5, port this class or drop it" -#endif -#if (QT_VERSION < 0x050000) #include "kvi_debug.h" #include "KviError.h" #include "KviLocale.h" -#include <QFtp> +#if (QT_VERSION > 0x050000) + // Qt >= 5.0.0 has no QFtp. + // We use the external source code module provided by digia (in qtftp) + #include <qftp.h> +#else + // Use standard QFtp + #include <QFtp> +#endif + #include <QHashIterator> /* @@ -333,4 +337,4 @@ KVSO_CLASS_FUNCTION(ftp,stateChangedEvent) return true; } -#endif + |