diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-12-06 23:46:15 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-12-06 23:46:15 (GMT) |
| commit | 47008b211fe3b972077466e593a2a9016446bab2 (patch) | |
| tree | dfb1d9ebd3e3b9e64e5f4e55e5c92fc4e62f54ac | |
| parent | 7f347a24bc7983d192ab6e545ca33abb515cbba2 (diff) | |
| parent | f34cfa14ff6b0928f98143f72e1f512eceabe27c (diff) | |
| download | Qt-47008b211fe3b972077466e593a2a9016446bab2.zip Qt-47008b211fe3b972077466e593a2a9016446bab2.tar.gz Qt-47008b211fe3b972077466e593a2a9016446bab2.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/opengl/qgl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 94b8aa5..f6f6bb3 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4171,7 +4171,7 @@ void QGLWidget::qglColor(const QColor& c) const const QGLContext *ctx = QGLContext::currentContext(); if (ctx) { if (ctx->format().rgba()) - glColor4ub(c.red(), c.green(), c.blue(), c.alpha()); + glColor4f(c.redF(), c.greenF(), c.blueF(), c.alphaF()); else if (!d->cmap.isEmpty()) { // QGLColormap in use? int i = d->cmap.find(c.rgb()); if (i < 0) diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 8ab17a0..ed7fdff 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -110,11 +110,7 @@ static bool DEBUG_TEMP_FLAG; static inline void qt_glColor4ubv(unsigned char *col) { -#ifdef QT_OPENGL_ES - glColor4f(col[0]/255.0, col[1]/255.0, col[2]/255.0, col[3]/255.0); -#else - glColor4ubv(col); -#endif + glColor4f(col[0]/255.0f, col[1]/255.0f, col[2]/255.0f, col[3]/255.0f); } struct QT_PointF { |