projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47b36ae
)
No -rpath-link on Mac.
author
Morten Sorvig
<msorvig@trolltech.com>
Wed, 11 May 2011 13:19:24 +0000
(15:19 +0200)
committer
Morten Sorvig
<msorvig@trolltech.com>
Wed, 11 May 2011 13:20:18 +0000
(15:20 +0200)
mkspecs/features/qt_functions.prf
patch
|
blob
|
history
diff --git
a/mkspecs/features/qt_functions.prf
b/mkspecs/features/qt_functions.prf
index
50a85d8
..
86d80cb
100644
(file)
--- a/
mkspecs/features/qt_functions.prf
+++ b/
mkspecs/features/qt_functions.prf
@@
-142,7
+142,7
@@
defineTest(qtAddModule) {
# Make sure we can link to uninstalled libraries
!isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) {
QMAKE_LIBDIR *= $$MODULE_LIBS
- unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+ unix:
!mac:
QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
}
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d