1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with qt-xcb and another installed qt in a system location

Browse Source 
amends fc1092cf, necessary because of (the earlier) a28364bc1.

Change-Id: I5c86bcb27854994e59228fd205c799396464554d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-08-24 12:35:50 +02:00
parent 4f3b5fab38
commit e41263b61a
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
View File

@ -3,6 +3,8 @@ QT += core-private gui-private platformsupport-private xcb_qpa_lib-private
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
INCLUDEPATH += $$PWD/../ INCLUDEPATH += $$PWD/../
load(qt_build_paths)
# needed by Xcursor ... # needed by Xcursor ...
contains(QT_CONFIG, xcb-xlib) { contains(QT_CONFIG, xcb-xlib) {
DEFINES += XCB_USE_XLIB DEFINES += XCB_USE_XLIB

2
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -38,6 +38,8 @@ HEADERS = \
qxcbxsettings.h \ qxcbxsettings.h \
qxcbsystemtraytracker.h qxcbsystemtraytracker.h
load(qt_build_paths)
DEFINES += QT_BUILD_XCB_PLUGIN DEFINES += QT_BUILD_XCB_PLUGIN
# needed by Xcursor ... # needed by Xcursor ...
contains(QT_CONFIG, xcb-xlib) { contains(QT_CONFIG, xcb-xlib) {