diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
| commit | 65faf4565595d91996ddec4af25af5e97c7f0317 (patch) | |
| tree | a7415e90db3fa1e46f638e1c31d2f2b9a5d0ec4a /src/plugins/platforms/eglfs | |
| parent | a9383ef99a29c333a1edd32695ddc29ea0ba805d (diff) | |
| parent | 26bc4ac5cb56ce8f2d3d10125fa9c6a72140573a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/platforms/eglfs/eglfs-plugin.pro
Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db
Diffstat (limited to 'src/plugins/platforms/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/eglfs-plugin.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro index 3844328ee0..ec229796e5 100644 --- a/src/plugins/platforms/eglfs/eglfs-plugin.pro +++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro @@ -4,6 +4,9 @@ QT += eglfsdeviceintegration-private CONFIG += egl +# Avoid X11 header collision, use generic EGL native types +DEFINES += QT_EGL_NO_X11 + SOURCES += $$PWD/qeglfsmain.cpp OTHER_FILES += $$PWD/eglfs.json |