diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-28 14:00:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:26:44 +0000 |
| commit | a64cfadaff82a3521d89efc69f72f85017418561 (patch) | |
| tree | 5879355b3480d03d61c20c371017e5c6b963b738 /mkspecs/features/qt_common.prf | |
| parent | 022c68c97f0a4c3c2569e3b7f69aa0dd7589fd1c (diff) | |
make the installed meta files play nicely with sysroots
pkg-config .pc files use the raw target paths (and pkg-config patches up
-I and -L flags on the fly), so these files were actually already fine.
libtool .la files use the magic prefix = to denote the sysroot.
this works only with libtool 2.4+ (sept 2010).
qmake .prl files have no built-in sysrootification magic, but as they are
read by qmake, it's possible to put property references into them. this
makes them relocatable, both inside and outside sysroots.
Change-Id: I97236ac81e7aba4e4771d14a44cbf59144cc2d3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/qt_common.prf')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index eb65e73079..6a66b76305 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -24,16 +24,19 @@ contains(TEMPLATE, .*lib) { rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR - host_build: \ + host_build { + qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] - else: \ - qt_libdir = $$[QT_INSTALL_LIBS/raw] + } else { + qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] + qt_libdir = $$[QT_INSTALL_LIBS] + } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" lib_replace.replace = } else { lib_replace.match = $$rplbase/lib - lib_replace.replace = $$qt_libdir + lib_replace.replace = $$qqt_libdir } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace |