diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index 5de79c9e1eef36ac412c70f10ef270f9d809e2d2..41d53be31e74b3a6fb5d66371d97cac1f1fc4a10 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -1776,7 +1776,7 @@ void QOpenGLShaderProgram::setAttributeBuffer Q_UNUSED(d); if (location != -1) { d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride, - reinterpret_cast<const void *>(offset)); + reinterpret_cast<const void *>(qintptr(offset))); } } diff --git a/src/gui/opengl/qtriangulatingstroker.cpp b/src/gui/opengl/qtriangulatingstroker.cpp index cfbf8a75c547fa52806721f94d11676793616f5b..5967bd6e89b9e80e6198b5421378656a33749898 100644 --- a/src/gui/opengl/qtriangulatingstroker.cpp +++ b/src/gui/opengl/qtriangulatingstroker.cpp @@ -127,7 +127,7 @@ void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, co m_roundness = 1; } else if (cosmetic) { m_curvyness_add = realWidth / 2; - m_curvyness_mul = CURVE_FLATNESS; + m_curvyness_mul = float(CURVE_FLATNESS); m_roundness = qMax<int>(4, realWidth * CURVE_FLATNESS); } else { m_curvyness_add = m_width; @@ -543,7 +543,7 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c curvynessMul = CURVE_FLATNESS / m_inv_scale; } else if (cosmetic) { curvynessAdd= width / 2; - curvynessMul= CURVE_FLATNESS; + curvynessMul= float(CURVE_FLATNESS); } else { curvynessAdd = width * m_inv_scale; curvynessMul = CURVE_FLATNESS / m_inv_scale; diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index c0122eb59f36202d068130e92a014344a5191a7f..abd4a59fb8050d5074f1d69a12e206f251d03bba 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1706,7 +1706,7 @@ void QGLShaderProgram::setAttributeBuffer Q_UNUSED(d); if (location != -1) { d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride, - reinterpret_cast<const void *>(offset)); + reinterpret_cast<const void *>(qintptr(offset))); } }