From ea6431e2769de217873131b67101f5e034583bdc Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 5 Sep 2016 14:03:39 +0200
Subject: [PATCH] Fixed Windows shadow build with Qt 5.6 or higher

---
 plugins/Common/retroshare_plugin.pri      |  8 ++++----
 plugins/VOIP/VOIP.pro                     |  4 ++--
 retroshare-gui/src/retroshare-gui.pro     | 20 ++++++++++----------
 retroshare-nogui/src/retroshare-nogui.pro | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri
index 5030d6ee7..cbfec1b8d 100644
--- a/plugins/Common/retroshare_plugin.pri
+++ b/plugins/Common/retroshare_plugin.pri
@@ -3,8 +3,8 @@
 TEMPLATE = lib
 CONFIG *= plugin
 
-DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
-INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
+DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
+INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
 
 unix {
 	target.path = "$${PLUGIN_DIR}"
@@ -67,8 +67,8 @@ win32 {
 	DEPENDPATH += . $$INC_DIR
 	INCLUDEPATH += . $$INC_DIR
 
-	PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
-	LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
+	PRE_TARGETDEPS += $$OUT_PWD/../../retroshare-gui/src/lib/libretroshare-gui.a
+	LIBS += -L"$$OUT_PWD/../../retroshare-gui/src/lib" -lretroshare-gui
 
 	for(lib, LIB_DIR):LIBS += -L"$$lib"
 	for(bin, BIN_DIR):LIBS += -L"$$bin"
diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro
index 72b2d1d5e..5fac6b780 100644
--- a/plugins/VOIP/VOIP.pro
+++ b/plugins/VOIP/VOIP.pro
@@ -13,8 +13,8 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) {
 CONFIG += qt uic qrc resources
 MOBILITY = multimedia
 
-DEPENDPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
-INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
+DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui
+INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui
 
 #################################### Linux #####################################
 
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index d21d35eb8..4dcaf8dca 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -305,22 +305,22 @@ openbsd-* {
 
 # ###########################################
 
-DEPENDPATH += . ../../libretroshare/src/
-INCLUDEPATH += ../../libretroshare/src/
+DEPENDPATH += . $$PWD/../../libretroshare/src/
+INCLUDEPATH += $$PWD/../../libretroshare/src/
 
-PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-LIBS *= ../../libretroshare/src/lib/libretroshare.a
+PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
+LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
 
 wikipoos {
-	PRE_TARGETDEPS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 }
 
 # webinterface
-DEPENDPATH += ../../libresapi/src
-INCLUDEPATH += ../../libresapi/src
-PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
-LIBS += ../../libresapi/src/lib/libresapi.a
+DEPENDPATH += $$PWD/../../libresapi/src
+INCLUDEPATH += $$PWD/../../libresapi/src
+PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
+LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
 
 # Input
 HEADERS +=  rshare.h \
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 03482fe6c..c66ae37cd 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -165,11 +165,11 @@ haiku-* {
 
 ############################## Common stuff ######################################
 
-DEPENDPATH += . ../../libretroshare/src
-INCLUDEPATH += . ../../libretroshare/src
+DEPENDPATH += . $$PWD/../../libretroshare/src
+INCLUDEPATH += . $$PWD/../../libretroshare/src
 
-PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-LIBS *= ../../libretroshare/src/lib/libretroshare.a
+PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
+LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
 
 # Input
 HEADERS +=  notifytxt.h
@@ -184,10 +184,10 @@ introserver {
 
 libresapihttpserver {
 	DEFINES *= ENABLE_WEBUI
-        PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
-	LIBS += ../../libresapi/src/lib/libresapi.a
-        DEPENDPATH += ../../libresapi/src
-	INCLUDEPATH += ../../libresapi/src
+        PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
+	LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
+        DEPENDPATH += $$PWD/../../libresapi/src
+	INCLUDEPATH += $$PWD/../../libresapi/src
         HEADERS += \
             TerminalApiClient.h
         SOURCES +=  \
@@ -200,8 +200,8 @@ sshserver {
 	# Please use this path below.
         # (You can modify it locally if required - but dont commit it!)
 
-	#LIBSSH_DIR = ../../../lib/libssh-0.5.2
-	LIBSSH_DIR = ../../../libssh-0.6.0rc1
+	#LIBSSH_DIR = $PWD/../../../lib/libssh-0.5.2
+	LIBSSH_DIR = $PWD/../../../libssh-0.6.0rc1
 
 	#
 	# Use the following commend to generate a Server RSA Key.