forked from pool/libqt5-qtbase
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From a473f90a3637255d8443ab8621b57a3e9d90b031 Mon Sep 17 00:00:00 2001
|
||
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||
|
Date: Thu, 6 Jun 2019 20:05:27 +0200
|
||
|
Subject: [PATCH 1/3] Revert "Fix QMAKE_PRL_INSTALL_REPLACE for macOS"
|
||
|
|
||
|
This reverts commit 015d7f16cb0b6812950caa3bcde3b6758403ae34.
|
||
|
---
|
||
|
mkspecs/features/qt_common.prf | 8 ++------
|
||
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
||
|
|
||
|
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
|
||
|
index e64dfa98c2..17a07dbab9 100644
|
||
|
--- a/mkspecs/features/qt_common.prf
|
||
|
+++ b/mkspecs/features/qt_common.prf
|
||
|
@@ -49,14 +49,10 @@ 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,
|
||
|
--
|
||
|
2.21.0
|
||
|
|