diff options
| author | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
| commit | eed04255446df8a749390e14cef7672c26329f6e (patch) | |
| tree | 1b6cbd53bb0f90f27db3d4e36370bca024e4abad /src/opengl/gl2paintengineex | |
| parent | f360555f3c7ded3c729ce972fbd65f035876b1b4 (diff) | |
| parent | f425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff) | |
| download | Qt-eed04255446df8a749390e14cef7672c26329f6e.zip Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.gz Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulatingstroker.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulatingstroker_p.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp index a3c8266..ec05020 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp @@ -42,6 +42,7 @@ #include "qtriangulatingstroker_p.h" #include <qmath.h> +QT_BEGIN_NAMESPACE #define CURVE_FLATNESS Q_PI / 8 @@ -338,3 +339,6 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen) m_dash_stroker.end(); } + +QT_END_NAMESPACE + diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h index b7354db..483cea9 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h @@ -48,6 +48,7 @@ #include <private/qnumeric_p.h> #include <private/qmath_p.h> +QT_BEGIN_NAMESPACE class QTriangulatingStroker { @@ -295,5 +296,6 @@ void QTriangulatingStroker::join(const qreal *pts) emitLineSegment(m_cx, m_cy, m_nvx, m_nvy); } +QT_END_NAMESPACE #endif |