diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
| commit | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch) | |
| tree | 7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/opengl | |
| parent | f27c2533f735d53c6b555f387c6390c0690cc246 (diff) | |
| download | tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip | |
Automated update from Qt3
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/ntqgl.h | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h index 0ebe5a6b3..a8f933cf7 100644 --- a/src/opengl/ntqgl.h +++ b/src/opengl/ntqgl.h @@ -235,7 +235,7 @@ protected: void* vi; void* cx; #if defined(Q_WS_X11) - Q_UINT32 gpm; + TQ_UINT32 gpm; #endif #endif TQGLFormat glFormat; 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 |