Fixed Windows compile with Qt 5 (Merged from branch v0.5.5)

- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/services/p3heartbeat.cc

@@ -23,6 +23,8 @@
  *
  */
 
+#include <time.h>
+
 #include "services/p3heartbeat.h"
 #include "serialiser/rsheartbeatitems.h"
 

openpgpsdk/src/openpgpsdk.pro

@@ -1,5 +1,9 @@
 TEMPLATE = lib
-CONFIG = staticlib debug
+win32 {
+	CONFIG += staticlib
+} else {
+	CONFIG = staticlib debug
+}
 
 DEFINES *= OPENSSL_NO_IDEA 
 

plugins/FeedReader/FeedReader.pro

@@ -1,8 +1,3 @@
-win32 {
-	# Fix double defined symbols BIO_* (Find a better solution)
-	LIBS += -lcrypto
-}
-
 !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
 
 CONFIG += qt uic qrc resources
@@ -101,8 +96,8 @@ win32 {
 
 	INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include
 
-	LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32
-	LIBS += -lssl -lcrypto -lgdi32 -lwsock32
+	# Change order of the libraries
+	LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 -lwsock32 $${LIBS}
 }
 
 openbsd-* {