Skip to content

Commit

Permalink
Fix QMAKE_PRL_INSTALL_REPLACE for macOS
Browse files Browse the repository at this point in the history
The regular expression with the alternative is not portable.
Use a separate QMAKE_PRL_INSTALL_REPLACE item.

This amends commit f00de33.

Fixes: QTBUG-75950
Change-Id: I78e172053f8b05be7d595a1c9e1695ea658b0547
Reviewed-by: Iikka Eklund <[email protected]>
Reviewed-by: Oliver Wolff <[email protected]>
  • Loading branch information
jobor committed May 22, 2019
1 parent f00de33 commit 015d7f1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions mkspecs/features/qt_common.prf
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,14 @@ contains(TEMPLATE, .*lib) {
lib_replace.match = $$rplbase/lib
lib_replace.replace = $$qqt_libdir
}
!equals(qt_libdir, $$rplbase/lib): \
lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\)
lib_replace.CONFIG = path
QMAKE_PRL_INSTALL_REPLACE += lib_replace
!equals(qt_libdir, $$rplbase/lib) {
qtlibdir_replace.match = $$qt_libdir
qtlibdir_replace.replace = $$qqt_libdir
qtlibdir_replace.CONFIG = path
QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
}
}

# The remainder of this file must not apply to host tools/libraries,
Expand Down

0 comments on commit 015d7f1

Please sign in to comment.