diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/opengl/qgl_x11.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index a738aa486..a0e07187f 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -497,7 +497,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext ) d->paintDevice->handle(), choose_cmap( disp, (XVisualInfo *)vi ) ); #else - gpm = (Q_UINT32)glXCreateGLXPixmap( disp, (XVisualInfo *)vi, + gpm = (TQ_UINT32)glXCreateGLXPixmap( disp, (XVisualInfo *)vi, d->paintDevice->handle() ); #endif if ( !gpm ) @@ -1236,7 +1236,7 @@ bool TQGLWidget::renderCxPm( TQPixmap* pm ) choose_cmap( pm->x11Display(), (XVisualInfo*)glcx->vi ) ); #else - glPm = (Q_UINT32)glXCreateGLXPixmap( x11Display(), + glPm = (TQ_UINT32)glXCreateGLXPixmap( x11Display(), (XVisualInfo*)glcx->vi, (Pixmap)pm->handle() ); #endif |