Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 00:07:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1993 from PhenomRetroShare/Fix_Qt5.15

Browse Source 
Fix build with Qt 5.15+
This commit is contained in:
G10h4ck 2020-06-03 23:39:06 +02:00 committed by GitHub
commit b29abaf67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/elastic/elnode.h
View File

@ -23,6 +23,10 @@
#ifndef ELNODE_H #ifndef ELNODE_H
#define ELNODE_H #define ELNODE_H
#include "graphwidget.h"
#include <retroshare/rstypes.h>
#include <QApplication> #include <QApplication>
#if QT_VERSION >= 0x040600 #if QT_VERSION >= 0x040600
#include <QGraphicsObject> #include <QGraphicsObject>
@ -30,9 +34,7 @@
#include <QGraphicsItem> #include <QGraphicsItem>
#endif #endif
#include <QList> #include <QList>
#include <QPainterPath>
#include <retroshare/rstypes.h>
#include "graphwidget.h"
class Edge; class Edge;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

16
retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
View File

@ -18,6 +18,14 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#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 <QAbstractTextDocumentLayout>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
@ -25,15 +33,9 @@
#include <QMenu> #include <QMenu>
#include <QMimeData> #include <QMimeData>
#include <QPainter> #include <QPainter>
#include <QPainterPath>
#include <QTextDocument> #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> #include <iostream>
#define PCITEM_COLUMN_COMMENT 0 #define PCITEM_COLUMN_COMMENT 0

20
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View File

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