Skip to content

Commit 7d2463e

Browse files
jonasschnelligades
authored andcommitted
Merge bitcoin#20650: depends: Drop workaround for a fixed bug in Qt build system
267f259 depends: Drop workaround for a fixed bug in Qt build system (Hennadii Stepanov) Pull request description: This PR drops workaround that was [introduced](bitcoin@1dec09b) for Qt 5.2.1 for a bug in Qt build system that has been fixed in Qt 5.3.0. The bug reports: - https://bugreports.qt.io/browse/QTBUG-35444 - https://bugreports.qt.io/browse/QTBUG-32519 I've noted this change is a part of the bitcoin#19716, but I think that a separate commit with the documented reason will benefit it. ACKs for top commit: laanwj: Code review ACK 267f259 jonasschnelli: code Review ACK 267f259 practicalswift: cr ACK 267f259: patch looks correct Tree-SHA512: b994f94776b4f8bb2f996095c87c7fef55e74d1e64852a890d664275e3739ec890ee388b10baa15445dd24ec7b971ce57d396cb062dbed933c18b6b69525349f
1 parent 1c90355 commit 7d2463e

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,7 @@ define $(package)_stage_cmds
193193
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. && \
194194
$(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
195195
$(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \
196-
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
197-
if `test -f qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a`; then \
198-
cp qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a $($(package)_staging_prefix_dir)/lib; \
199-
fi
196+
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets
200197
endef
201198

202199
define $(package)_postprocess_cmds

0 commit comments

Comments
 (0)