diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-29 20:06:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-20 17:18:16 +0000 |
| commit | 2d8801a9622ca47e377dfb7e1cb73f1809c764ed (patch) | |
| tree | 8cde178b850fb09fcddb5809ac8af4dcd41bf8e9 /mkspecs/common/mac.conf | |
| parent | bf929938293abd398c2c6f3e88c4774e56f75efa (diff) | |
support relative paths in QMAKE_RPATHDIR
... and make use of it in qt.prf.
[ChangeLog][qmake][Unix] Added support for relative paths in
QMAKE_RPATHDIR.
Note that this technically breaks backwards compatibility, as relative
paths were previously silently resolved against $$_PRO_FILE_PWD_. This
was not documented and seems rather useless, so i'm not worried.
Change-Id: I855042a8962ab34ad4617899a5b9825af0087f8a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/common/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index d80b41c74b..ad3c638a6f 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -22,6 +22,9 @@ QMAKE_FIX_RPATH = install_name_tool -id QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip +QMAKE_LFLAGS_REL_RPATH = +QMAKE_REL_RPATH_BASE = @loader_path + QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_THREAD = |