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

Merge of branch v0.6-rssocialnet 7419 to 7488. Changes from electron and myself:

Browse source 
- added possibility to modify groups (e.g. edit circles)
- fixed mismatched free/delete in fimonitor.cc, authssl.cc, pqibin.cc (saving encrypted hash cache file)
- improved plugin interface class to allow plugins to access GXS objects.
- added method to un-register notify clients from RsNotify
- fixed pqisslproxy for windows, due to win not properly supporting sockets in non blocking mode.
- removed static members form RsInitConfig and made RsAccounts object a pointer. This prevents plugin initialisation problems at symbol resolving time.
- removed bool return from p3IdService::getOwnIds()



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-08-25 21:07:07 +00:00
parent 906efa6f6c
commit f6db432c74
24 changed files with 525 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

36
retroshare-gui/src/retroshare-gui.pro
View file

@ -1,6 +1,9 @@
QT += network xml script
CONFIG += qt gui uic qrc resources idle bitdht
#QMAKE_CFLAGS += -fmudflap
#LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a
greaterThan(QT_MAJOR_VERSION, 4) {
# Qt 5
QT += uitools widgets multimedia printsupport
@ -144,6 +147,11 @@ win32-x-g++ {
#################################### Windows #####################################
win32 {
debug {
# show console output
CONFIG += console
}
# Switch on extra warnings
QMAKE_CFLAGS += -Wextra
QMAKE_CXXFLAGS += -Wextra
@ -484,13 +492,13 @@ HEADERS += rshare.h \
gui/statusbar/dhtstatus.h \
gui/statusbar/ratesstatus.h \
gui/statusbar/hashingstatus.h \
gui/statusbar/discstatus.h \
gui/statusbar/SoundStatus.h \
gui/statusbar/OpModeStatus.h \
gui/statusbar/ToasterDisable.h \
gui/advsearch/advancedsearchdialog.h \
gui/advsearch/expressionwidget.h \
gui/advsearch/guiexprelement.h \
gui/statusbar/discstatus.h \
gui/statusbar/SoundStatus.h \
gui/statusbar/OpModeStatus.h \
gui/statusbar/ToasterDisable.h \
gui/advsearch/advancedsearchdialog.h \
gui/advsearch/expressionwidget.h \
gui/advsearch/guiexprelement.h \
gui/elastic/graphwidget.h \
gui/elastic/edge.h \
gui/elastic/arrow.h \
@ -801,13 +809,13 @@ SOURCES += main.cpp \
gui/statusbar/dhtstatus.cpp \
gui/statusbar/ratesstatus.cpp \
gui/statusbar/hashingstatus.cpp \
gui/statusbar/discstatus.cpp \
gui/statusbar/SoundStatus.cpp \
gui/statusbar/OpModeStatus.cpp \
gui/statusbar/ToasterDisable.cpp \
gui/toaster/MessageToaster.cpp \
gui/toaster/DownloadToaster.cpp \
gui/toaster/OnlineToaster.cpp \
gui/statusbar/discstatus.cpp \
gui/statusbar/SoundStatus.cpp \
gui/statusbar/OpModeStatus.cpp \
gui/statusbar/ToasterDisable.cpp \
gui/toaster/MessageToaster.cpp \
gui/toaster/DownloadToaster.cpp \
gui/toaster/OnlineToaster.cpp \
gui/toaster/ChatToaster.cpp \
gui/toaster/GroupChatToaster.cpp \
gui/toaster/ChatLobbyToaster.cpp \