Skip to content

Commit 5129b36

Browse files
committed
build: Clean remnants of QTBUG-34748 fix
A fix for QTBUG-34748 was introduced in #5915 (v0.11.0, Qt 5.2.1). QTBUG-34748 was fixed in version 5.3.0. The separated patch file, provided by #5915, was dropped in #12971 while bumping Qt to 5.9.4 (5.9.6). But libxcb.mk remained unchanged. This change reverts #5915 for libxcb.mk.
1 parent 8c21562 commit 5129b36

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

depends/packages/libxcb.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@ define $(package)_preprocess_cmds
2727
sed "s/pthread-stubs//" -i configure
2828
endef
2929

30-
# Don't install xcb headers to the default path in order to work around a qt
31-
# build issue: https://bugreports.qt.io/browse/QTBUG-34748
32-
# When using qt's internal libxcb, it may end up finding the real headers in
33-
# depends staging. Use a non-default path to avoid that.
34-
3530
define $(package)_config_cmds
36-
$($(package)_autoconf) --includedir=$(host_prefix)/include/xcb-shared
31+
$($(package)_autoconf)
3732
endef
3833

3934
define $(package)_build_cmds

0 commit comments

Comments
 (0)