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.
49 lines
1.9 KiB
49 lines
1.9 KiB
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 |
|
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 |
|
@@ -76,8 +76,6 @@ |
|
|
|
DEFINES += $$QMAKE_DEFINES_XCB |
|
LIBS += $$QMAKE_LIBS_XCB |
|
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB |
|
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB |
|
|
|
CONFIG += qpa/genericunixfontdatabase |
|
|
|
@@ -89,7 +87,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$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() |
|
} else { |
|
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama |
|
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro |
|
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro |
|
@@ -9,7 +9,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 |
|
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro |
|
@@ -6,6 +6,13 @@ |
|
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 |
|
+} |
|
+ |
|
PLUGIN_TYPE = platforms |
|
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin |
|
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
|
|
|