diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-07 20:47:37 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-08 06:16:56 +0200 |
| commit | 2bf5e2edbb67d6bc0ad021f79c2ff3939a174669 (patch) | |
| tree | bcfbd20ac2b6e8969dc092ad9df93c71d647084f | |
| parent | 12d5608a2521bd10313b44c6c56d68b9a0a680cc (diff) | |
| download | qtbase-2bf5e2edbb67d6bc0ad021f79c2ff3939a174669.tar.gz | |
Fix path replacement on install for header module prl files
For prefix builds the prl files of header modules still contained the
absolute path of the install prefix instead of $$[QT_INSTALL_LIBS]. This
was, because the QMAKE_PRL_INSTALL_REPLACE variable was only filled for
'lib' TEMPLATE projects. Header modules, however, have the 'aux'
template.
Fixes: QTBUG-82871
Change-Id: I90f248967f1bff41423d871a977ae91c78015bbd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | mkspecs/features/qt_common.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index c24f2c6062..99e9a4c145 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -26,7 +26,8 @@ contains(TEMPLATE, .*lib) { if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions qtConfig(separate_debug_info): CONFIG += separate_debug_info - +} +contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) { !isEmpty(_QMAKE_SUPER_CACHE_): \ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ |