You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

fix-xcb-include-order.patch 1.9KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. --- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
  2. +++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
  3. @@ -76,8 +76,6 @@
  4. DEFINES += $$QMAKE_DEFINES_XCB
  5. LIBS += $$QMAKE_LIBS_XCB
  6. -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
  7. -QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
  8. CONFIG += qpa/genericunixfontdatabase
  9. @@ -89,7 +87,8 @@
  10. contains(QT_CONFIG, xcb-qt) {
  11. DEFINES += XCB_USE_RENDER
  12. XCB_DIR = ../../../3rdparty/xcb
  13. - INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
  14. + QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
  15. + QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
  16. LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
  17. } else {
  18. LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
  19. --- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
  20. +++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
  21. @@ -9,7 +9,8 @@
  22. XCB_DIR = ../../../../3rdparty/xcb
  23. -INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
  24. +QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
  25. +QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
  26. QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
  27. QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
  28. --- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
  29. +++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
  30. @@ -6,6 +6,13 @@
  31. qxcbmain.cpp
  32. OTHER_FILES += xcb.json README
  33. +contains(QT_CONFIG, xcb-qt) {
  34. + DEFINES += XCB_USE_RENDER
  35. + XCB_DIR = ../../../3rdparty/xcb
  36. + QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
  37. + QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
  38. +}
  39. +
  40. PLUGIN_TYPE = platforms
  41. PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
  42. !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -