Changeset 846 for trunk/include/QtOpenGL
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 3 edited
- 3 copied
-
. (modified) (1 prop)
-
include/QtOpenGL/QGLBuffer (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtOpenGL/QGLBuffer )
-
include/QtOpenGL/QtOpenGL (modified) (1 diff)
-
include/QtOpenGL/headers.pri (modified) (1 diff)
-
include/QtOpenGL/private/qgl_cl_p.h (deleted)
-
include/QtOpenGL/private/qtriangulator_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtOpenGL/private/qtriangulator_p.h )
-
include/QtOpenGL/qglbuffer.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtOpenGL/qglbuffer.h )
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/include/QtOpenGL/QtOpenGL
r561 r846 4 4 #include <QtGui/QtGui> 5 5 #include "qgl.h" 6 #include "qglbuffer.h" 6 7 #include "qglcolormap.h" 7 8 #include "qglframebufferobject.h" -
trunk/include/QtOpenGL/headers.pri
r651 r846 1 SYNCQT.HEADER_FILES = qgl.h qgl colormap.h qglframebufferobject.h qglpixelbuffer.h qglscreen_qws.h qglshaderprogram.h ../../include/QtOpenGL/QtOpenGL2 SYNCQT.HEADER_CLASSES = ../../include/QtOpenGL/QMacGLCompatTypes ../../include/QtOpenGL/QMacCompatGLint ../../include/QtOpenGL/QMacCompatGLuint ../../include/QtOpenGL/QMacCompatGLenum ../../include/QtOpenGL/QGLFormat ../../include/QtOpenGL/QGLContext ../../include/QtOpenGL/QGLWidget ../../include/QtOpenGL/QGL Colormap ../../include/QtOpenGL/QGLFramebufferObject ../../include/QtOpenGL/QGLFramebufferObjectFormat ../../include/QtOpenGL/QGLPixelBuffer ../../include/QtOpenGL/QGLScreenSurfaceFunctions ../../include/QtOpenGL/QGLScreen ../../include/QtOpenGL/QGLShader ../../include/QtOpenGL/QGLShaderProgram3 SYNCQT.PRIVATE_HEADER_FILES = qgl_ cl_p.h qgl_egl_p.h qgl_p.h qglextensions_p.h qglframebufferobject_p.h qglpaintdevice_p.h qglpixelbuffer_p.h qglpixmapfilter_p.h qglwindowsurface_qws_p.h qgraphicsshadereffect_p.h qgraphicssystem_gl_p.h qpaintengine_opengl_p.h qpixmapdata_gl_p.h qpixmapdata_x11gl_p.h qwindowsurface_gl_p.h qwindowsurface_x11gl_p.h ../opengl/gl2paintengineex/qgl2pexvertexarray_p.h ../opengl/gl2paintengineex/qglcustomshaderstage_p.h ../opengl/gl2paintengineex/qglengineshadermanager_p.h ../opengl/gl2paintengineex/qglengineshadersource_p.h ../opengl/gl2paintengineex/qglgradientcache_p.h ../opengl/gl2paintengineex/qpaintengineex_opengl2_p.h ../opengl/gl2paintengineex/qtextureglyphcache_gl_p.h ../opengl/gl2paintengineex/qtriangulatingstroker_p.h ../opengl/util/fragmentprograms_p.h1 SYNCQT.HEADER_FILES = qgl.h qglbuffer.h qglcolormap.h qglframebufferobject.h qglpixelbuffer.h qglscreen_qws.h qglshaderprogram.h ../../include/QtOpenGL/QtOpenGL 2 SYNCQT.HEADER_CLASSES = ../../include/QtOpenGL/QMacGLCompatTypes ../../include/QtOpenGL/QMacCompatGLint ../../include/QtOpenGL/QMacCompatGLuint ../../include/QtOpenGL/QMacCompatGLenum ../../include/QtOpenGL/QGLFormat ../../include/QtOpenGL/QGLContext ../../include/QtOpenGL/QGLWidget ../../include/QtOpenGL/QGLBuffer ../../include/QtOpenGL/QGLColormap ../../include/QtOpenGL/QGLFramebufferObject ../../include/QtOpenGL/QGLFramebufferObjectFormat ../../include/QtOpenGL/QGLPixelBuffer ../../include/QtOpenGL/QGLScreenSurfaceFunctions ../../include/QtOpenGL/QGLScreen ../../include/QtOpenGL/QGLShader ../../include/QtOpenGL/QGLShaderProgram 3 SYNCQT.PRIVATE_HEADER_FILES = qgl_egl_p.h qgl_p.h qglextensions_p.h qglframebufferobject_p.h qglpaintdevice_p.h qglpixelbuffer_p.h qglpixmapfilter_p.h qglwindowsurface_qws_p.h qgraphicsshadereffect_p.h qgraphicssystem_gl_p.h qpaintengine_opengl_p.h qpixmapdata_gl_p.h qpixmapdata_x11gl_p.h qwindowsurface_gl_p.h qwindowsurface_x11gl_p.h ../opengl/gl2paintengineex/qgl2pexvertexarray_p.h ../opengl/gl2paintengineex/qglcustomshaderstage_p.h ../opengl/gl2paintengineex/qglengineshadermanager_p.h ../opengl/gl2paintengineex/qglengineshadersource_p.h ../opengl/gl2paintengineex/qglgradientcache_p.h ../opengl/gl2paintengineex/qpaintengineex_opengl2_p.h ../opengl/gl2paintengineex/qtextureglyphcache_gl_p.h ../opengl/gl2paintengineex/qtriangulatingstroker_p.h ../opengl/gl2paintengineex/qtriangulator_p.h ../opengl/util/fragmentprograms_p.h
Note:
See TracChangeset
for help on using the changeset viewer.
