Permalink
Browse files

Used QMAKE_RPATHDIR instead of deprecated QMAKE_RPATH etc.

  • Loading branch information...
1 parent 15e45d1 commit 0d553a91a1a180a9f85e9e58c281b3624907ca1c jpnurmi committed Nov 26, 2010
Showing with 2 additions and 6 deletions.
  1. +1 −5 features/qxt.prf
  2. +1 −1 src/qxtlibs.pri
View
@@ -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}
View
@@ -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

0 comments on commit 0d553a9

Please sign in to comment.