mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 07:29:33 -05:00
Fixed compile with disabled Circles and PhotoShare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
35994e7197
commit
6590167475
@ -27,8 +27,12 @@
|
||||
#include <retroshare/rsiface.h>
|
||||
|
||||
#include "gui/Identity/IdDialog.h"
|
||||
#ifdef RS_USE_CIRCLES
|
||||
#include "gui/Circles/CirclesDialog.h"
|
||||
#endif
|
||||
#ifdef RS_USE_PHOTOSHARE
|
||||
#include "gui/PhotoShare/PhotoShare.h"
|
||||
#endif
|
||||
#include "gui/WikiPoos/WikiDialog.h"
|
||||
#include "gui/Posted/PostedDialog.h"
|
||||
#include "gui/GxsForumsDialog.h"
|
||||
@ -93,13 +97,17 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
|
||||
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
|
||||
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
|
||||
|
||||
// CirclesDialog *circlesDialog = NULL;
|
||||
// ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
|
||||
// createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
|
||||
#ifdef RS_USE_CIRCLES
|
||||
CirclesDialog *circlesDialog = NULL;
|
||||
ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
|
||||
createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
|
||||
#endif
|
||||
|
||||
// PhotoShare *photoShare = NULL;
|
||||
// ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
|
||||
// createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
|
||||
#ifdef RS_USE_PHOTOSHARE
|
||||
PhotoShare *photoShare = NULL;
|
||||
ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
|
||||
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
|
||||
#endif
|
||||
|
||||
PostedDialog *postedDialog = NULL;
|
||||
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
|
||||
|
@ -920,6 +920,7 @@ unfinished {
|
||||
|
||||
|
||||
photoshare {
|
||||
DEFINES += RS_USE_PHOTOSHARE
|
||||
|
||||
HEADERS += \
|
||||
gui/PhotoShare/PhotoDrop.h \
|
||||
@ -1016,6 +1017,7 @@ identities {
|
||||
}
|
||||
|
||||
circles {
|
||||
DEFINES += RS_USE_CIRCLES
|
||||
|
||||
HEADERS += \
|
||||
gui/Circles/CirclesDialog.h \
|
||||
|
Loading…
Reference in New Issue
Block a user