diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-04-15 20:33:35 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-20 20:39:01 +0000 |
| commit | c4cc615b4d30a08999659ca63ac2f50d59bc72f7 (patch) | |
| tree | 23e68d9e96dcb22da28a4722122026f437984f16 /mkspecs | |
| parent | 080f0362593786ac547ad8e499565a322f40b0b3 (diff) | |
Fix prl generation with static dependencies take 2
In the case of mulit-config we did install module pri files with
the build path, which resulted in builds which uses those modules
as dependencies in incorrect prl files containing also build paths.
Use sed to correct pri files on install for debug and release
builds also.
Pick-to: 5.15.4
Task-number: QTBUG-91385
Change-Id: I3d78025acde4fa27977b9ab9ae0bf1d8e678e393
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 964e256ee0..2d67a30fb7 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -116,5 +116,22 @@ installed|if(!not_installed:qtConfig(static)) { pri_lib_replace.CONFIG = path pri_lib_replace.filename = qt_ext_$${MODULE}.pri QMAKE_INSTALL_REPLACE += pri_header_replace pri_lib_replace + if(msvc|qtConfig(debug_and_release)): { + rpl_lib_target = $$prefix$${TARGET}.$$suffix + pri_lib_release_replace.match = $$DESTDIR/$${rpl_lib_target} + pri_lib_release_replace.replace = $$qqt_dir/$${rpl_lib_target} + pri_lib_release_replace.CONFIG = path + pri_lib_release_replace.filename = qt_ext_$${MODULE}.pri + QMAKE_INSTALL_REPLACE += pri_lib_release_replace + win32: \ + rpl_lib_target = $$prefix$${TARGET}d.$$suffix + else: darwin: \ + rpl_lib_target = $$prefix$${TARGET}_debug.$$suffix + pri_lib_debug_replace.match = $$DESTDIR/$${rpl_lib_target} + pri_lib_debug_replace.replace = $$qqt_dir/$${rpl_lib_target} + pri_lib_debug_replace.CONFIG = path + pri_lib_debug_replace.filename = qt_ext_$${MODULE}.pri + QMAKE_INSTALL_REPLACE += pri_lib_debug_replace + } load(qt_installs) } |