diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-17 14:37:43 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-17 14:37:43 (GMT) |
commit | d35f2b40d8547d61790aa7ecc66a216a407daf89 (patch) | |
tree | 5ab50b21840f11063c22fa78ae3a1e4414765329 /src/plugins/platforms/eglconvenience/qxlibeglintegration.h | |
parent | d4fa1878ff1e7628d3e984d54f8a93810353c71b (diff) | |
parent | 1276390941efc9625342f769d9ba0aa405bc53a1 (diff) | |
download | Qt-d35f2b40d8547d61790aa7ecc66a216a407daf89.zip Qt-d35f2b40d8547d61790aa7ecc66a216a407daf89.tar.gz Qt-d35f2b40d8547d61790aa7ecc66a216a407daf89.tar.bz2 |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'src/plugins/platforms/eglconvenience/qxlibeglintegration.h')
-rw-r--r-- | src/plugins/platforms/eglconvenience/qxlibeglintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglconvenience/qxlibeglintegration.h b/src/plugins/platforms/eglconvenience/qxlibeglintegration.h index 51996da..6c2e266 100644 --- a/src/plugins/platforms/eglconvenience/qxlibeglintegration.h +++ b/src/plugins/platforms/eglconvenience/qxlibeglintegration.h @@ -47,7 +47,7 @@ class QXlibEglIntegration { public: - static VisualID getCompatibleVisualId(Display *display, EGLConfig config); + static VisualID getCompatibleVisualId(Display *display, EGLDisplay eglDisplay, EGLConfig config); }; #endif // QTESTLITEEGLINTEGRATION_H |