From 87b89ecbfd83a744854a5e20c96bcd6ee99b2316 Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Sun, 23 Aug 2015 03:08:37 +0200
Subject: Port KVS ftp class to Qt5

---
 src/modules/objects/KvsObject_ftp.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/modules/objects/KvsObject_ftp.cpp')

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
+
-- 
cgit v1.3.1-10-gc9f91