diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 10:36:25 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-30 11:05:30 +0200 |
| commit | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (patch) | |
| tree | a0f4fb342adaeb8bd56ec5b23b78a2cd84cff9a2 /src/gui/opengl/opengl.pri | |
| parent | 1056d02ee07ab9bba3a4dd9f5fd483d45773e665 (diff) | |
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>
Diffstat (limited to 'src/gui/opengl/opengl.pri')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 87b8d80d4b..ed715d9f35 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -16,16 +16,16 @@ HEADERS += opengl/qopengl.h \ opengl/qopenglgradientcache_p.h \ opengl/qopenglengineshadermanager_p.h \ opengl/qopengl2pexvertexarray_p.h \ - opengl/qpaintengineex_opengl2_p.h \ + opengl/qopenglpaintengine_p.h \ opengl/qopenglengineshadersource_p.h \ opengl/qopenglcustomshaderstage_p.h \ - opengl/qtriangulatingstroker_p.h \ - opengl/qtriangulator_p.h \ - opengl/qrbtree_p.h \ - opengl/qtextureglyphcache_gl_p.h \ + opengl/qopengltriangulatingstroker_p.h \ + opengl/qopengltextureglyphcache_p.h \ opengl/qopenglshadercache_p.h \ opengl/qopenglshadercache_meego_p.h \ - opengl/qopenglcolormap.h + opengl/qopenglcolormap.h \ + opengl/qtriangulator_p.h \ + opengl/qrbtree_p.h SOURCES += opengl/qopengl.cpp \ opengl/qopenglfunctions.cpp \ @@ -36,11 +36,11 @@ SOURCES += opengl/qopengl.cpp \ opengl/qopenglgradientcache.cpp \ opengl/qopenglengineshadermanager.cpp \ opengl/qopengl2pexvertexarray.cpp \ - opengl/qpaintengineex_opengl2.cpp \ + opengl/qopenglpaintengine.cpp \ opengl/qopenglcustomshaderstage.cpp \ - opengl/qtriangulatingstroker.cpp \ - opengl/qtriangulator.cpp \ - opengl/qtextureglyphcache_gl.cpp \ - opengl/qopenglcolormap.cpp + opengl/qopengltriangulatingstroker.cpp \ + opengl/qopengltextureglyphcache.cpp \ + opengl/qopenglcolormap.cpp \ + opengl/qtriangulator.cpp #INCLUDEPATH += ../3rdparty/harfbuzz/src |