diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 09:06:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-02-17 10:36:32 +0000 |
| commit | e5c3700a61c03e674544e51a063de80338f8a7b0 (patch) | |
| tree | b7c0860f3c83358b2bea03e7915fd98d09db7c02 /src/plugins/platforms | |
| parent | a81dfb32d6f9e7a407567511c20b59e537f6a063 (diff) | |
| parent | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsglcontext.h | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index 23d2fd0d09..dfaa428520 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -48,6 +48,7 @@ #include <vector> QT_BEGIN_NAMESPACE +#ifndef QT_NO_OPENGL class QDebug; @@ -227,7 +228,7 @@ private: GLenum (APIENTRY * m_getGraphicsResetStatus)(); bool m_lost; }; - +#endif QT_END_NAMESPACE #endif // QWINDOWSGLCONTEXT_H diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 3444b21654..8c5f8cae08 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -605,7 +605,8 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra initializeXRender(); #if defined(XCB_USE_XINPUT2) - initializeXInput2(); + if (!qEnvironmentVariableIsSet("QT_XCB_NO_XI2")) + initializeXInput2(); #endif initializeXShape(); initializeXKB(); |