Merge pull request #1993 from PhenomRetroShare/Fix_Qt5.15

Fix build with Qt 5.15+
RetroShare · Jun 3, 2020 · b29abaf · b29abaf
2 parents 5f06651 + bbaad83
commit b29abaf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
@@ -23,16 +23,18 @@
 #ifndef ELNODE_H
 #define ELNODE_H
 
+#include "graphwidget.h"
+
+#include <retroshare/rstypes.h>
+
 #include <QApplication>
 #if QT_VERSION >= 0x040600
 #include <QGraphicsObject>
 #else
 #include <QGraphicsItem>
 #endif
 #include <QList>
-
-#include <retroshare/rstypes.h>
-#include "graphwidget.h"
+#include <QPainterPath>
 
 class Edge;
 QT_BEGIN_NAMESPACE

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -18,22 +18,24 @@
  *                                                                             *
  *******************************************************************************/
 
+#include "GxsCommentTreeWidget.h"
+
+#include "gui/common/FilesDefs.h"
+#include "gui/common/RSElidedItemDelegate.h"
+#include "gui/common/RSTreeWidgetItem.h"
+#include "gui/gxs/GxsCreateCommentDialog.h"
+#include "gui/gxs/GxsIdTreeWidgetItem.h"
+
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
 #include <QClipboard>
 #include <QDateTime>
 #include <QMenu>
 #include <QMimeData>
 #include <QPainter>
+#include <QPainterPath>
 #include <QTextDocument>
 
-#include "gui/common/RSElidedItemDelegate.h"
-#include "gui/common/FilesDefs.h"
-#include "gui/gxs/GxsCommentTreeWidget.h"
-#include "gui/gxs/GxsCreateCommentDialog.h"
-#include "gui/gxs/GxsIdTreeWidgetItem.h"
-#include "gui/common/RSTreeWidgetItem.h"
-
 #include <iostream>
 
 #define PCITEM_COLUMN_COMMENT		0

diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
@@ -18,21 +18,23 @@
  *                                                                             *
  *******************************************************************************/
 
-#include <QApplication>
-#include <QThread>
-#include <QTimerEvent>
-#include <QMutexLocker>
+#include "GxsIdDetails.h"
 
-#include <math.h>
-#include <util/rsdir.h>
 #include "gui/common/AvatarDialog.h"
-#include "GxsIdDetails.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
 
 #include <retroshare/rspeers.h>
+#include <util/rsdir.h>
 
-#include <iostream>
+#include <QApplication>
+#include <QMutexLocker>
 #include <QPainter>
+#include <QPainterPath>
+#include <QThread>
+#include <QTimerEvent>
+
+#include <iostream>
+#include <cmath>
 
 /* Images for tag icons */
 #define IMAGE_LOADING     ":/images/folder-draft.png"