From 0591ef0432c3f0138ea839db78a127c7c822f7c8 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 1 Sep 2011 16:42:05 +0000 Subject: [PATCH] corrected bad modification of commit #4560, which made RS not compilable on ubuntu karmic git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4584 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/elastic/node.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/retroshare-gui/src/gui/elastic/node.h b/retroshare-gui/src/gui/elastic/node.h index 79abd89fd..9b40b4177 100644 --- a/retroshare-gui/src/gui/elastic/node.h +++ b/retroshare-gui/src/gui/elastic/node.h @@ -42,7 +42,12 @@ #ifndef NODE_H #define NODE_H +#include +#if QT_VERSION >= 0x040600 #include +#else +#include +#endif #include #include "graphwidget.h" @@ -52,7 +57,11 @@ QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; QT_END_NAMESPACE +#if QT_VERSION >= 0x040600 class Node : public QGraphicsObject +#else +class Node : public QObject, public QGraphicsItem +#endif { Q_OBJECT