diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 22:57:59 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:32:28 (GMT) |
| commit | 7c594907d521bb29ecca1b953a4ceea49ec32dd4 (patch) | |
| tree | 98d614193f484a9f62f3080de3b55b43888f6700 /src/opengl/gl2paintengineex | |
| parent | 69e873e2bfae3fc028c21d93112a75008c3bb58b (diff) | |
| download | Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.zip Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.gz Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.bz2 | |
Compile Qt in C++0x mode.
This is not valid in C++0x:
char str[] = { 128, 0 };
Because 128 cannot be represented in a char. The same applies to
conversion from int to qreal: it's a narrowing conversion, with
possible data loss.
More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing
Reviewed-by: Trust Me
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index ad07d9d..9ed722f 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -529,10 +529,10 @@ void QGL2PaintEngineEx::beginNativePainting() float mv_matrix[4][4] = { - { mtx.m11(), mtx.m12(), 0, mtx.m13() }, - { mtx.m21(), mtx.m22(), 0, mtx.m23() }, - { 0, 0, 1, 0 }, - { mtx.dx(), mtx.dy(), 0, mtx.m33() } + { float(mtx.m11()), float(mtx.m12()), 0, float(mtx.m13()) }, + { float(mtx.m21()), float(mtx.m22()), 0, float(mtx.m23()) }, + { 0, 0, 1, 0 }, + { float(mtx.dx()), float(mtx.dy()), 0, float(mtx.m33()) } }; const QSize sz = d->device->size(); |