From 0d553a91a1a180a9f85e9e58c281b3624907ca1c Mon Sep 17 00:00:00 2001
From: jpnurmi <devnull@localhost>
Date: Fri, 26 Nov 2010 21:48:44 +0200
Subject: [PATCH] Used QMAKE_RPATHDIR instead of deprecated QMAKE_RPATH etc.

---
 features/qxt.prf | 6 +-----
 src/qxtlibs.pri  | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/features/qxt.prf b/features/qxt.prf
index 101b80ee..a9082718 100644
--- a/features/qxt.prf
+++ b/features/qxt.prf
@@ -3,11 +3,7 @@ include(qxtvars.prf)
 DEPENDPATH      += $${QXT_INSTALL_HEADERS}
 INCLUDEPATH     += $${QXT_INSTALL_HEADERS}
 
-unix:!macx{
-        QXTQMAKERPATH=$${QMAKE_RPATH}
-        isEmpty(QXTQMAKERPATH):QXTQMAKERPATH=-Wl,-rpath,
-        LIBS += $${QXTQMAKERPATH}$${QXT_INSTALL_LIBS}
-}
+QMAKE_RPATHDIR  += $${QXT_INSTALL_LIBS}
 macx:LIBS       += -F$${QXT_INSTALL_LIBS}
 LIBS            += -L$${QXT_INSTALL_LIBS}
 
diff --git a/src/qxtlibs.pri b/src/qxtlibs.pri
index 2fb27b6b..6a2e61eb 100644
--- a/src/qxtlibs.pri
+++ b/src/qxtlibs.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $${QXT_SOURCE_TREE}/include
 DEPENDPATH += $${QXT_SOURCE_TREE}/include
-unix:!macx:LIBS += -Wl,-rpath,$${QXT_BUILD_TREE}/lib
+QMAKE_RPATHDIR += $${QXT_BUILD_TREE}/lib
 macx:LIBS += -F$${QXT_BUILD_TREE}/lib
 LIBS += -L$${QXT_BUILD_TREE}/lib