diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-10 13:16:24 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-10 13:16:24 (GMT) |
| commit | 2e8d090fa6813a2e37c9ed27d69bc3fc99a7ae35 (patch) | |
| tree | eaf54ffe4e8a90b8ba1fe03855ab3f0808b012e8 /src/opengl | |
| parent | 8032423bb8fa91c623ece61bff528adfd49e8685 (diff) | |
| download | Qt-2e8d090fa6813a2e37c9ed27d69bc3fc99a7ae35.zip Qt-2e8d090fa6813a2e37c9ed27d69bc3fc99a7ae35.tar.gz Qt-2e8d090fa6813a2e37c9ed27d69bc3fc99a7ae35.tar.bz2 | |
Make QStaticText public API again
QStaticText was previously made private API to support inclusion in
Qt 4.6.x. This change turns it back into public API for Qt 4.7.0.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 685f0c1..4ae8e6a 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -77,7 +77,7 @@ #include <private/qfontengine_p.h> #include <private/qpixmapdata_gl_p.h> #include <private/qdatabuffer_p.h> -#include <private/qstatictext_p_p.h> +#include <private/qstatictext_p.h> #include "qglgradientcache_p.h" #include "qglengineshadermanager_p.h" diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index e7a1b7e..a2f085c 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -60,7 +60,7 @@ #include <private/qglpixelbuffer_p.h> #include <private/qbezier_p.h> #include <qglframebufferobject.h> -#include <private/qstatictext_p_p.h> +#include <private/qstatictext_p.h> #include "private/qtessellator_p.h" |