diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-08 19:30:36 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-08 19:30:36 (GMT) |
| commit | 596eed45c626ea2652e1f9495a0946d32eb4c6da (patch) | |
| tree | 5b6ad81d3f837729fc37c3592fa20fdedc26a237 | |
| parent | f3c37838ab149a8a570b7f1df987705815ae45c0 (diff) | |
| parent | 0b78ccc201f58b53c90e6327b051bfdb8c08ee14 (diff) | |
| download | Qt-596eed45c626ea2652e1f9495a0946d32eb4c6da.zip Qt-596eed45c626ea2652e1f9495a0946d32eb4c6da.tar.gz Qt-596eed45c626ea2652e1f9495a0946d32eb4c6da.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
| -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 { |