mirror of
https://github.com/dashpay/dash.git
synced 2024-12-29 13:59:06 +01:00
87229e06c2
bb077fa[depends] Remove OBJCXX define from config.site.in (fanquake)c37ea4ddepends: fix qt translations build (Cory Fields)2b32deadepends: use new variable layout for qt sdk (Cory Fields)02fcb29[depends] Qt 5.7.1 (fanquake)
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
--- 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 = -
|