diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
| commit | cc74452d6d259d36ac47c536f11a5efb269e8e44 (patch) | |
| tree | e43ac89e9edde354d12fbddffcbb6e40108cc643 /src/plugins/platforms/xcb/gl_integrations | |
| parent | 6cbd982836266a59e926d8f149ad0013bd8162a3 (diff) | |
| parent | e52fcb7dc78c83586c813f55f087a98bae4eaa0e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/winrt/qwinrtclipboard.cpp
Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri index c2d3849d8e..68cb91ff3d 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri +++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri @@ -3,6 +3,8 @@ QT += core-private gui-private platformsupport-private xcb_qpa_lib-private INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD/../ +load(qt_build_paths) + # needed by Xcursor ... contains(QT_CONFIG, xcb-xlib) { DEFINES += XCB_USE_XLIB |