diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:30:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:32:30 (GMT) |
| commit | 1aca37afd10fbb4c440f7a66fb7ad3f23e47a312 (patch) | |
| tree | 6a480b4888bcc6e6472803c9ff7eba8f3b3529cc /src/3rdparty/phonon | |
| parent | 7c594907d521bb29ecca1b953a4ceea49ec32dd4 (diff) | |
| download | Qt-1aca37afd10fbb4c440f7a66fb7ad3f23e47a312.zip Qt-1aca37afd10fbb4c440f7a66fb7ad3f23e47a312.tar.gz Qt-1aca37afd10fbb4c440f7a66fb7ad3f23e47a312.tar.bz2 | |
Compile Phonon in C++0x mode.
Will upstream the patch
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]); |