diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 13:49:26 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 14:52:40 +0200 |
| commit | 8c6755aeec312ae771ef334fc863642514db3f7c (patch) | |
| tree | 3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /examples/opengl | |
| parent | 104debb6627d71f5540bb2c3347ce56dddc63594 (diff) | |
| parent | c40a48af997f57caa0ecfca0b247837ba5b2f89b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/pbuffers/cube.cpp | 2 | ||||
| -rw-r--r-- | examples/opengl/shared/qtlogo.cpp | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/examples/opengl/pbuffers/cube.cpp b/examples/opengl/pbuffers/cube.cpp index ffa08780d7..dc1bb23fea 100644 --- a/examples/opengl/pbuffers/cube.cpp +++ b/examples/opengl/pbuffers/cube.cpp @@ -44,8 +44,6 @@ #include <QtGui/QImage> #include <QtCore/QPropertyAnimation> -static const qreal FACE_SIZE = 0.4; - static const qreal speeds[] = { 3.8f, 4.4f, 5.6f }; static const qreal amplitudes[] = { 2.0f, 2.5f, 3.0f }; diff --git a/examples/opengl/shared/qtlogo.cpp b/examples/opengl/shared/qtlogo.cpp index ea175234ae..608f5b3f2b 100644 --- a/examples/opengl/shared/qtlogo.cpp +++ b/examples/opengl/shared/qtlogo.cpp @@ -49,10 +49,7 @@ static const qreal tee_height = 0.311126; static const qreal cross_width = 0.25; static const qreal bar_thickness = 0.113137; -static const qreal inside_diam = 0.20; -static const qreal outside_diam = 0.30; static const qreal logo_depth = 0.10; -static const int num_divisions = 32; //! [0] struct Geometry |