diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-11 13:18:28 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-13 10:47:38 +0200 |
| commit | 9864d2c6f3b628ca9f07a56b197e77bd43931cca (patch) | |
| tree | 42a7e1748ce3cd5cdc0d720e9fea8a5d165c0092 /mkspecs/features/qmake_use.prf | |
| parent | 39b0a6f152d70eff50fde978c074a6a0860e6394 (diff) | |
Revert "configure: actually resolve libraries into full filepaths"
This reverts commit 521a85395da1a2728902816c072ec46bcb0ad380.
Having libraries resolved to absolute file paths by configure has
annoying consequences:
1. The Qt installer needs to unabsolutify paths in all kinds of files.
This is error-prone and fragile.
2. It hurts Qt's relocatabilty. The absolute paths are unlikely to be
right on different systems.
3. Qt's configure must imitate linker behavior correctly to do the
resolution right on every platform, which is hard to get right.
Consequently, the disadvantages of 521a8539 outweigh the advantages.
Task-number: QTBUG-72903
Change-Id: I3e159c46a1348963615b95614e56f026ecb2aefd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'mkspecs/features/qmake_use.prf')
| -rw-r--r-- | mkspecs/features/qmake_use.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf index ecb4f7ed41..8475e4111a 100644 --- a/mkspecs/features/qmake_use.prf +++ b/mkspecs/features/qmake_use.prf @@ -22,6 +22,8 @@ for(ever) { !defined(QMAKE_LIBS_$$nu, var): \ error("Library '$$lower($$replace(nu, _, -))' is not defined.") + QMAKE_LIBDIR += $$eval(QMAKE_LIBDIR_$$nu) + android { ABI_LIBS = $$eval(QMAKE_LIBS_$${nu}_$${QT_ARCH}) isEmpty(ABI_LIBS): ABI_LIBS = $$eval(QMAKE_LIBS_$${nu}) |