summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2012-12-04 10:02:22 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-06 10:24:05 +0100
commit945e8c9f8ed324e0a600dc97b81c3166979fcd8a (patch)
treeb23eb4dfddaf082fb293f966e2fa9d816c725d19
parent6b4994c265889db2058b7d5850b51ddfc5478754 (diff)
downloadqtmultimedia-945e8c9f8ed324e0a600dc97b81c3166979fcd8a.tar.gz
Fixed build on MacOS with clang in C++11 mode.
avfvideowidget.mm:120:9: error: non-constant-expression cannot be narrowed from type 'int' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] x1, y1, zValue, ^~ Change-Id: I5a08bf8b53cf029dbdfaeaa03f4babd6d49d62ad Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/plugins/avfoundation/mediaplayer/avfvideowidget.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
index 307539851..a6a2f4236 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
@@ -103,11 +103,11 @@ void AVFVideoWidget::paintGL()
return;
QRect targetRect = displayRect();
- int x1 = targetRect.left();
- int x2 = targetRect.right();
- int y1 = targetRect.bottom();
- int y2 = targetRect.top();
- int zValue = 0;
+ GLfloat x1 = targetRect.left();
+ GLfloat x2 = targetRect.right();
+ GLfloat y1 = targetRect.bottom();
+ GLfloat y2 = targetRect.top();
+ GLfloat zValue = 0;
const GLfloat textureCoordinates[] = {
0, 0,