Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-04 12:24:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1235 from G10h4ck/build_improvements

Browse source 
Build improvements
This commit is contained in:
G10h4ck 2018-04-23 12:04:35 +02:00 • committed by GitHub
commit 82eb42ad8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 533 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -107,10 +107,13 @@
#include "gui/common/RsCollection.h"
#include "settings/rsettingswin.h"
#include "settings/rsharesettings.h"
#include "settings/WebuiPage.h"
#include "common/StatusDefs.h"
#include "gui/notifyqt.h"
#ifdef ENABLE_WEBUI
# include "settings/WebuiPage.h"
#endif
#include <iomanip>
#include <unistd.h>

5
retroshare-gui/src/gui/settings/rsettingswin.cpp
View file

@ -41,12 +41,15 @@
#include "PostedPage.h"
#include "PluginsPage.h"
#include "ServicePermissionsPage.h"
#include "WebuiPage.h"
#include "rsharesettings.h"
#include "gui/notifyqt.h"
#include "gui/common/FloatingHelpBrowser.h"
#include "gui/common/RSElidedItemDelegate.h"
#ifdef ENABLE_WEBUI
# include "WebuiPage.h"
#endif
#define IMAGE_GENERAL ":/images/kcmsystem24.png"
#define ITEM_SPACING 2

2
retroshare-gui/src/gui/settings/rsharesettings.cpp
View file

@ -35,7 +35,7 @@
#include <retroshare/rspeers.h>
#if defined(Q_OS_WIN)
#include <util/win32.h>
#include <util/retroshareWin32.h>
#endif
/* Retroshare's Settings */