diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
tree | d12041105160c1cb21226b365edb9653d87b5853 /src/platformsupport/eglconvenience/qt_egl_p.h | |
parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/platformsupport/eglconvenience/qt_egl_p.h')
-rw-r--r-- | src/platformsupport/eglconvenience/qt_egl_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h index b1495c9f9d..e2c6b0ceb6 100644 --- a/src/platformsupport/eglconvenience/qt_egl_p.h +++ b/src/platformsupport/eglconvenience/qt_egl_p.h @@ -53,8 +53,10 @@ #ifdef QT_EGL_NO_X11 # define MESA_EGL_NO_X11_HEADERS // MESA -# define WIN_INTERFACE_CUSTOM // NV -#endif // QT_EGL_NO_X11 +# if !defined(Q_OS_INTEGRITY) +# define WIN_INTERFACE_CUSTOM // NV +# endif // Q_OS_INTEGRITY +#endif // QT_EGL_NO_X11 #ifdef QT_EGL_WAYLAND # define WAYLAND // NV |