diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2015-07-24 16:22:24 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-27 12:25:28 +0200 |
| commit | 060b3d377b0a0d318f630beb7fe4d8f41b99981c (patch) | |
| tree | f92c641d3791112d4a1d22d43948b7ef99723edb | |
| parent | ecd6a89381a34d4bcd07593a2e377656d070a7ed (diff) | |
fixup: qt 5.5 snuck in another module that needs path hand-holding
| -rw-r--r-- | depends/patches/qt/fix-xcb-include-order.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/depends/patches/qt/fix-xcb-include-order.patch b/depends/patches/qt/fix-xcb-include-order.patch index ca0c0f3710..ae469ea94b 100644 --- a/depends/patches/qt/fix-xcb-include-order.patch +++ b/depends/patches/qt/fix-xcb-include-order.patch @@ -31,3 +31,15 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB +--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400 ++++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400 +@@ -11,3 +11,9 @@ + qxcbmain.cpp + OTHER_FILES += xcb.json README + ++contains(QT_CONFIG, xcb-qt) { ++ DEFINES += XCB_USE_RENDER ++ XCB_DIR = ../../../3rdparty/xcb ++ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB ++ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB ++} |