mirror of https://github.com/bitcoin/bitcoin
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.
46 lines
2.0 KiB
46 lines
2.0 KiB
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
|
|
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
|
|
@@ -94,8 +94,6 @@
|
|
|
|
DEFINES += $$QMAKE_DEFINES_XCB
|
|
LIBS += $$QMAKE_LIBS_XCB
|
|
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
|
|
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
|
|
|
|
CONFIG += qpa/genericunixfontdatabase
|
|
|
|
@@ -104,7 +102,8 @@
|
|
contains(QT_CONFIG, xcb-qt) {
|
|
DEFINES += XCB_USE_RENDER
|
|
XCB_DIR = ../../../3rdparty/xcb
|
|
- INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
|
|
+ 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
|
|
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
|
|
} else {
|
|
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms
|
|
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000
|
|
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000
|
|
@@ -8,7 +8,8 @@
|
|
|
|
XCB_DIR = ../../../../3rdparty/xcb
|
|
|
|
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
|
|
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
|
|
+QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
|
|
|
|
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
|
|
+}
|