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
This commit is contained in:
thunder2 2014-02-12 22:03:20 +00:00
parent df34a6818c
commit f818bb8e9a
3 changed files with 9 additions and 8 deletions

View file

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