MrBesen/QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used QMAKE_RPATHDIR instead of deprecated QMAKE_RPATH etc.

Browse Source
This commit is contained in:
J-P Nurmi 2010-11-26 21:48:44 +02:00
parent ca7dc89073
commit c1de72b791
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/qxt.prf
View File

@ -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}

2
src/qxtlibs.pri
View File

@ -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