Changeset 561 for trunk/include/QtOpenGL
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 3 edited
- 17 copied
-
. (modified) (1 prop)
-
include/QtOpenGL/QGLFramebufferObjectFormat (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/QGLFramebufferObjectFormat )
-
include/QtOpenGL/QGLScreen (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/QGLScreen )
-
include/QtOpenGL/QGLScreenSurfaceFunctions (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/QGLScreenSurfaceFunctions )
-
include/QtOpenGL/QGLShader (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/QGLShader )
-
include/QtOpenGL/QGLShaderProgram (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/QGLShaderProgram )
-
include/QtOpenGL/QtOpenGL (modified) (1 diff)
-
include/QtOpenGL/glgc_shader_source.h (deleted)
-
include/QtOpenGL/headers.pri (modified) (1 diff)
-
include/QtOpenGL/private/qegl_p.h (deleted)
-
include/QtOpenGL/private/qglcustomshaderstage_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglcustomshaderstage_p.h )
-
include/QtOpenGL/private/qglengineshadermanager_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglengineshadermanager_p.h )
-
include/QtOpenGL/private/qglengineshadersource_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglengineshadersource_p.h )
-
include/QtOpenGL/private/qglframebufferobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglframebufferobject_p.h )
-
include/QtOpenGL/private/qglpaintdevice_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglpaintdevice_p.h )
-
include/QtOpenGL/private/qglpexshadermanager_p.h (deleted)
-
include/QtOpenGL/private/qglshader_p.h (deleted)
-
include/QtOpenGL/private/qglwindowsurface_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qglwindowsurface_qws_p.h )
-
include/QtOpenGL/private/qgraphicsshadereffect_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qgraphicsshadereffect_p.h )
-
include/QtOpenGL/private/qpixmapdata_x11gl_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qpixmapdata_x11gl_p.h )
-
include/QtOpenGL/private/qtriangulatingstroker_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qtriangulatingstroker_p.h )
-
include/QtOpenGL/private/qwindowsurface_x11gl_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/private/qwindowsurface_x11gl_p.h )
-
include/QtOpenGL/qglscreen_qws.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/qglscreen_qws.h )
-
include/QtOpenGL/qglshaderprogram.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtOpenGL/qglshaderprogram.h )
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/include/QtOpenGL/QtOpenGL
r2 r561 7 7 #include "qglframebufferobject.h" 8 8 #include "qglpixelbuffer.h" 9 9 10 #endif -
trunk/include/QtOpenGL/headers.pri
r2 r561 1 SYNCQT.HEADER_FILES = qgl.h qglcolormap.h qglframebufferobject.h qglpixelbuffer.h ../opengl/gl2paintengineex/glgc_shader_source.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/QGLColormap ../../include/QtOpenGL/QGLFramebufferObject ../../include/QtOpenGL/QGLPixelBuffer 1 SYNCQT.HEADER_FILES = qgl.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/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_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/qtriangulatingstroker_p.h ../opengl/util/fragmentprograms_p.h
Note:
See TracChangeset
for help on using the changeset viewer.
