Skip to content

Commit 060b3d3

Browse files
theunilaanwj
authored andcommitted
fixup: qt 5.5 snuck in another module that needs path hand-holding
1 parent ecd6a89 commit 060b3d3

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

depends/patches/qt/fix-xcb-include-order.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,15 @@
3131

3232
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
3333
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
34+
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400
35+
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400
36+
@@ -11,3 +11,9 @@
37+
qxcbmain.cpp
38+
OTHER_FILES += xcb.json README
39+
40+
+contains(QT_CONFIG, xcb-qt) {
41+
+ DEFINES += XCB_USE_RENDER
42+
+ XCB_DIR = ../../../3rdparty/xcb
43+
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
44+
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
45+
+}

0 commit comments

Comments
 (0)