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

Fixed Windows shadow build with Qt 5.6 or higher

Browse source
This commit is contained in:
thunder2 2016-09-05 14:03:39 +02:00
parent 53e269838c
commit ea6431e276
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/Common/retroshare_plugin.pri
View file

@ -3,8 +3,8 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG *= plugin CONFIG *= plugin
DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/ DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/ INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
unix { unix {
target.path = "$${PLUGIN_DIR}" target.path = "$${PLUGIN_DIR}"
@ -67,8 +67,8 @@ win32 {
DEPENDPATH += . $$INC_DIR DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR
PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a PRE_TARGETDEPS += $$OUT_PWD/../../retroshare-gui/src/lib/libretroshare-gui.a
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui LIBS += -L"$$OUT_PWD/../../retroshare-gui/src/lib" -lretroshare-gui
for(lib, LIB_DIR):LIBS += -L"$$lib" for(lib, LIB_DIR):LIBS += -L"$$lib"
for(bin, BIN_DIR):LIBS += -L"$$bin" for(bin, BIN_DIR):LIBS += -L"$$bin"

4
plugins/VOIP/VOIP.pro
View file

@ -13,8 +13,8 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) {
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
MOBILITY = multimedia MOBILITY = multimedia
DEPENDPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui
INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui
#################################### Linux ##################################### #################################### Linux #####################################

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

@ -305,22 +305,22 @@ openbsd-* {
# ########################################### # ###########################################
DEPENDPATH += . ../../libretroshare/src/ DEPENDPATH += . $$PWD/../../libretroshare/src/
INCLUDEPATH += ../../libretroshare/src/ INCLUDEPATH += $$PWD/../../libretroshare/src/
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
wikipoos { wikipoos {
PRE_TARGETDEPS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
} }
# webinterface # webinterface
DEPENDPATH += ../../libresapi/src DEPENDPATH += $$PWD/../../libresapi/src
INCLUDEPATH += ../../libresapi/src INCLUDEPATH += $$PWD/../../libresapi/src
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
LIBS += ../../libresapi/src/lib/libresapi.a LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
# Input # Input
HEADERS += rshare.h \ HEADERS += rshare.h \

20
retroshare-nogui/src/retroshare-nogui.pro
View file

@ -165,11 +165,11 @@ haiku-* {
############################## Common stuff ###################################### ############################## Common stuff ######################################
DEPENDPATH += . ../../libretroshare/src DEPENDPATH += . $$PWD/../../libretroshare/src
INCLUDEPATH += . ../../libretroshare/src INCLUDEPATH += . $$PWD/../../libretroshare/src
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
# Input # Input
HEADERS += notifytxt.h HEADERS += notifytxt.h
@ -184,10 +184,10 @@ introserver {
libresapihttpserver { libresapihttpserver {
DEFINES *= ENABLE_WEBUI DEFINES *= ENABLE_WEBUI
PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
LIBS += ../../libresapi/src/lib/libresapi.a LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
DEPENDPATH += ../../libresapi/src DEPENDPATH += $$PWD/../../libresapi/src
INCLUDEPATH += ../../libresapi/src INCLUDEPATH += $$PWD/../../libresapi/src
HEADERS += \ HEADERS += \
TerminalApiClient.h TerminalApiClient.h
SOURCES += \ SOURCES += \
@ -200,8 +200,8 @@ sshserver {
# Please use this path below. # Please use this path below.
# (You can modify it locally if required - but dont commit it!) # (You can modify it locally if required - but dont commit it!)
#LIBSSH_DIR = ../../../lib/libssh-0.5.2 #LIBSSH_DIR = $PWD/../../../lib/libssh-0.5.2
LIBSSH_DIR = ../../../libssh-0.6.0rc1 LIBSSH_DIR = $PWD/../../../libssh-0.6.0rc1
# #
# Use the following commend to generate a Server RSA Key. # Use the following commend to generate a Server RSA Key.