diff options
author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-11-10 15:06:56 -0500 |
---|---|---|
committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-11-10 15:06:56 -0500 |
commit | c542bd114090753f5fc6f55e68605e1fd3bbd070 (patch) | |
tree | 02c0a5c5b74e73cbb41853bfd131a95ab54d9062 /platform | |
parent | 9038e963bea3dc40d0ba422d3fa88c924c595da8 (diff) | |
download | qtlocation-mapboxgl-c542bd114090753f5fc6f55e68605e1fd3bbd070.tar.gz |
repair undef None GLX wrapper, pass 0 instead of None to GLX functions
Diffstat (limited to 'platform')
-rw-r--r-- | platform/default/headless_display.cpp | 2 | ||||
-rw-r--r-- | platform/default/headless_view.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/default/headless_display.cpp b/platform/default/headless_display.cpp index 409fcbf057..ada48b8648 100644 --- a/platform/default/headless_display.cpp +++ b/platform/default/headless_display.cpp @@ -48,7 +48,7 @@ HeadlessDisplay::HeadlessDisplay() { // We're creating a dummy pbuffer anyway that we're not using. static int pixelFormat[] = { GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT, - None + 0 }; int configs = 0; diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp index 687f3ecf7d..1f5a0ec987 100644 --- a/platform/default/headless_view.cpp +++ b/platform/default/headless_view.cpp @@ -107,7 +107,7 @@ GLXContext createCoreProfile(Display *dpy, GLXFBConfig fbconfig) { const int context_flags[] = { GLX_CONTEXT_MAJOR_VERSION_ARB, core_profile_versions[i].major, GLX_CONTEXT_MINOR_VERSION_ARB, core_profile_versions[i].minor, - None + 0 }; ctx = glXCreateContextAttribsARB(dpy, fbconfig, 0, True, context_flags); if (context_creation_failed) { @@ -172,7 +172,7 @@ void HeadlessView::createContext() { int pbuffer_attributes[] = { GLX_PBUFFER_WIDTH, 8, GLX_PBUFFER_HEIGHT, 8, - None + 0 }; glx_pbuffer = glXCreatePbuffer(x_display, fb_configs[0], pbuffer_attributes); #endif |