diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-01-18 17:22:03 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:51:47 -0300 |
| commit | a3cf9b0a3cdf5ced4a12e44240c84ef8696a222b (patch) | |
| tree | bbb24a7b8bed5a939d5480441e8809d6eb82aa97 /PySide | |
| parent | 3e0b9e52deae29e6e7e463603db9a5f5847e826a (diff) | |
Fix bug#623 - "QGLWidget.bindTexture(QPixmap, GLenum, GLenum) is missing"
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 1 | ||||
| -rw-r--r-- | PySide/global.h.in | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index 35baf3c57..573bd8a6b 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -21,7 +21,9 @@ HAS_QT_MODULE(QT_QTWEBKIT_FOUND QtWebKit) HAS_QT_MODULE(QT_QTSVG_FOUND QtSvg) HAS_QT_MODULE(QT_QTXML_FOUND QtXml) HAS_QT_MODULE(QT_QTTEST_FOUND QtTest) -HAS_QT_MODULE(QT_QTOPENGL_FOUND QtOpenGL) +if (GL_H) + HAS_QT_MODULE(QT_QTOPENGL_FOUND QtOpenGL) +endif() HAS_QT_MODULE(QT_QTSQL_FOUND QtSql) if(QT_QTDESIGNER_FOUND) HAS_QT_MODULE(QT_QTUITOOLS_FOUND QtUiTools) diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index 86a6d7b63..f58d84940 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -20,7 +20,6 @@ --> <typesystem package="PySide.QtOpenGL"> <load-typesystem name="typesystem_gui.xml" generate="no" /> - <primitive-type name="GLuint" target-lang-api-name="PyLong" /> <rejection class="QGLColormap::QGLColormapData"/> <rejection class="QGLWidget" function-name="setMouseTracking"/> diff --git a/PySide/global.h.in b/PySide/global.h.in index 0e76e4681..88817b80a 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -1490,6 +1490,7 @@ QT_END_HEADER /* For compatibility with OpenGL v1.0 */ #define GL_LOGIC_OP GL_INDEX_LOGIC_OP #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT +#include <@GL_H@> #include <QtOpenGL/QtOpenGL> #endif // QT_NO_OPENGL |