diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-07-05 17:01:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 13:58:28 +0200 |
| commit | 16f8afa5b1c906ae60f98619d17c34b40c21804e (patch) | |
| tree | 94479e1009d298dfd46d049f20756ec501122e5a /src/gui | |
| parent | e7b28bce3b6b252ac35739ecd176a99695ab090f (diff) | |
Remove duplicate triangulating stroker implementation.
Change-Id: I9d8f609c9ecb02dd25e588313bc98db4b9325974
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 4 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 1 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine_p.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qtriangulatingstroker.cpp (renamed from src/gui/opengl/qopengltriangulatingstroker.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qtriangulatingstroker_p.h (renamed from src/gui/opengl/qopengltriangulatingstroker_p.h) | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 3becc2bcfe..c241354e9c 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -22,7 +22,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopenglpaintengine_p.h \ opengl/qopenglengineshadersource_p.h \ opengl/qopenglcustomshaderstage_p.h \ - opengl/qopengltriangulatingstroker_p.h \ + opengl/qtriangulatingstroker_p.h \ opengl/qopengltextureglyphcache_p.h \ opengl/qopenglshadercache_p.h \ opengl/qopenglshadercache_meego_p.h \ @@ -41,7 +41,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopengl2pexvertexarray.cpp \ opengl/qopenglpaintengine.cpp \ opengl/qopenglcustomshaderstage.cpp \ - opengl/qopengltriangulatingstroker.cpp \ + opengl/qtriangulatingstroker.cpp \ opengl/qopengltextureglyphcache.cpp \ opengl/qtriangulator.cpp diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 138a11a469..2f84a0f295 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -85,7 +85,6 @@ #include "qopenglengineshadermanager_p.h" #include "qopengl2pexvertexarray_p.h" -#include "qopengltriangulatingstroker_p.h" #include "qopengltextureglyphcache_p.h" #include <QDebug> diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 8b49ec250f..aa054c2557 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -62,7 +62,7 @@ #include <private/qopengl2pexvertexarray_p.h> #include <private/qfontengine_p.h> #include <private/qdatabuffer_p.h> -#include <private/qopengltriangulatingstroker_p.h> +#include <private/qtriangulatingstroker_p.h> #include <private/qopenglextensions_p.h> diff --git a/src/gui/opengl/qopengltriangulatingstroker.cpp b/src/gui/opengl/qtriangulatingstroker.cpp index ccf4eb30e7..c22b731ca0 100644 --- a/src/gui/opengl/qopengltriangulatingstroker.cpp +++ b/src/gui/opengl/qtriangulatingstroker.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qopengltriangulatingstroker_p.h" +#include "qtriangulatingstroker_p.h" #include <qmath.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/opengl/qopengltriangulatingstroker_p.h b/src/gui/opengl/qtriangulatingstroker_p.h index 27f414748e..4f36a4e6e6 100644 --- a/src/gui/opengl/qopengltriangulatingstroker_p.h +++ b/src/gui/opengl/qtriangulatingstroker_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QOPENGLTRIANGULATINGSTROKER_P_H -#define QOPENGLTRIANGULATINGSTROKER_P_H +#ifndef QTRIANGULATINGSTROKER_P_H +#define QTRIANGULATINGSTROKER_P_H #include <private/qdatabuffer_p.h> #include <qvarlengtharray.h> @@ -92,7 +92,7 @@ private: Qt::PenCapStyle m_cap_style; }; -class QDashedStrokeProcessor +class Q_GUI_EXPORT QDashedStrokeProcessor { public: QDashedStrokeProcessor(); |