a98a767695
Fixes #31685
This patch is applied in Homebrew here and looks to have worked for
them:
fafbdbd237/Formula/qt.rb (L33-L44)
I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).
Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.
This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
15 lines
509 B
Diff
15 lines
509 B
Diff
Partially reverts <https://codereview.qt-project.org/#/c/140954/>.
|
|
|
|
diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf
|
|
index bb28af97..36bb6483 100644
|
|
--- i/mkspecs/features/qt_module.prf
|
|
+++ w/mkspecs/features/qt_module.prf
|
|
@@ -245,7 +245,7 @@ load(qt_installs)
|
|
load(qt_targets)
|
|
|
|
# this builds on top of qt_common
|
|
-!internal_module:!lib_bundle:if(unix|mingw) {
|
|
+!internal_module:if(unix|mingw) {
|
|
CONFIG += create_pc
|
|
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
|
host_build: \
|