diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-09 22:51:35 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-09 22:51:35 (GMT) |
| commit | 77c3beb90e848a7c38459cd149f7eba977978955 (patch) | |
| tree | eb2384738261880df5ce7d0591f2423bb0eaf46f /src/opengl/qgl.cpp | |
| parent | 2196db60fa75fc559adb1405c1b43858122ff9e7 (diff) | |
| download | Qt-77c3beb90e848a7c38459cd149f7eba977978955.zip Qt-77c3beb90e848a7c38459cd149f7eba977978955.tar.gz Qt-77c3beb90e848a7c38459cd149f7eba977978955.tar.bz2 | |
Suppress warnings in QtOpenGL on OpenGL/ES 1.1 systems
Reviewed-by: trustme
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 799c749..3e30fe4 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1910,8 +1910,8 @@ static void convertToGLFormatHelper(QImage &dst, const QImage &img, GLenum textu int sbpl = img.bytesPerLine(); int dbpl = dst.bytesPerLine(); - int ix = 0x00010000 / sx; - int iy = 0x00010000 / sy; + int ix = int(0x00010000 / sx); + int iy = int(0x00010000 / sy); quint32 basex = int(0.5 * ix); quint32 srcy = int(0.5 * iy); @@ -2217,6 +2217,9 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, return data->texture(); } } +#else + Q_UNUSED(pd); + Q_UNUSED(q); #endif const qint64 key = pixmap.cacheKey(); |