Rename remaining gui/opengl source files to avoid name clashing.
authorSamuel Rødal <samuel.rodal@nokia.com>
Tue, 30 Aug 2011 08:36:25 +0000 (10:36 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 30 Aug 2011 09:05:30 +0000 (11:05 +0200)
commite9962cc300a805ce09a02ce0c9ae23ceaf8073bb
treea0f4fb342adaeb8bd56ec5b23b78a2cd84cff9a2
parent1056d02ee07ab9bba3a4dd9f5fd483d45773e665
Rename remaining gui/opengl source files to avoid name clashing.

We don't want to have source files in the opengl module and gui with the
same name, at least not private headers.

Change-Id: I5f2bf629c943a67a405574fb148aa4c70e58ecbb
Reviewed-on: http://codereview.qt.nokia.com/3864
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 files changed:
src/gui/opengl/opengl.pri
src/gui/opengl/qopenglcustomshaderstage.cpp
src/gui/opengl/qopenglengineshadermanager.cpp
src/gui/opengl/qopenglframebufferobject.cpp
src/gui/opengl/qopenglpaintengine.cpp [moved from src/gui/opengl/qpaintengineex_opengl2.cpp with 99% similarity]
src/gui/opengl/qopenglpaintengine_p.h [moved from src/gui/opengl/qpaintengineex_opengl2_p.h with 98% similarity]
src/gui/opengl/qopengltextureglyphcache.cpp [moved from src/gui/opengl/qtextureglyphcache_gl.cpp with 99% similarity]
src/gui/opengl/qopengltextureglyphcache_p.h [moved from src/gui/opengl/qtextureglyphcache_gl_p.h with 98% similarity]
src/gui/opengl/qopengltriangulatingstroker.cpp [moved from src/gui/opengl/qtriangulatingstroker.cpp with 99% similarity]
src/gui/opengl/qopengltriangulatingstroker_p.h [moved from src/gui/opengl/qtriangulatingstroker_p.h with 98% similarity]
src/opengl/gl2paintengineex/qrbtree_p.h [deleted file]
src/opengl/opengl.pro