diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 19:27:05 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 19:27:05 (GMT) |
| commit | 986873b239f15df43a3ebbc88a38f8ff8d6d07bf (patch) | |
| tree | 946f585f390d3abb835a3280bbdc6bc90724977c /src/3rdparty/phonon | |
| parent | b7f48eee301e973fcfae08dfd8997538b6dbe251 (diff) | |
| parent | 3671dbf34940e166b747b6f8f3f5758fd486073c (diff) | |
| download | Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.zip Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.gz Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/glrenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/glrenderer.cpp b/src/3rdparty/phonon/gstreamer/glrenderer.cpp index 6cf3459..0203028 100644 --- a/src/3rdparty/phonon/gstreamer/glrenderer.cpp +++ b/src/3rdparty/phonon/gstreamer/glrenderer.cpp @@ -304,7 +304,7 @@ void GLRenderWidgetImplementation::paintEvent(QPaintEvent *) const float tx_array[] = { 0, 0, 1, 0, 1, 1, 0, 1}; const QRectF r = drawFrameRect(); - const float v_array[] = { r.left(), r.top(), r.right(), r.top(), r.right(), r.bottom(), r.left(), r.bottom() }; + const float v_array[] = { float(r.left()), float(r.top()), float(r.right()), float(r.top()), float(r.right()), float(r.bottom()), float(r.left()), float(r.bottom()) }; glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, m_texture[0]); |