Used QMAKE_RPATHDIR instead of deprecated QMAKE_RPATH etc.

mnutt · Nov 26, 2010 · 0d553a9 · 0d553a9
1 parent 15e45d1
commit 0d553a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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{
+QMAKE_RPATHDIR  += $${QXT_INSTALL_LIBS}
-        QXTQMAKERPATH=$${QMAKE_RPATH}
-        isEmpty(QXTQMAKERPATH):QXTQMAKERPATH=-Wl,-rpath,
-        LIBS += $${QXTQMAKERPATH}$${QXT_INSTALL_LIBS}
-}
 macx:LIBS       += -F$${QXT_INSTALL_LIBS}
 LIBS            += -L$${QXT_INSTALL_LIBS}
 

diff --git 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