diff options
author | aavit <qt-info@nokia.com> | 2011-06-27 13:43:22 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-06-27 13:43:22 (GMT) |
commit | 4e25c4e1e2f648bcda55b2dca0857ff3e73245bf (patch) | |
tree | a6a5e21ac53271215d015480204849590e044ecc /src/opengl/qgl_symbian.cpp | |
parent | 514941c71b69ab967bdd18ae758f953de05f5480 (diff) | |
parent | c7fbfa24ede337a7e38d4436a927368d8d461621 (diff) | |
download | Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.zip Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.tar.gz Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.tar.bz2 |
Merge remote-tracking branch 'qt-mainline/4.8'
Diffstat (limited to 'src/opengl/qgl_symbian.cpp')
-rw-r--r-- | src/opengl/qgl_symbian.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp index 86176c9..21671a6 100644 --- a/src/opengl/qgl_symbian.cpp +++ b/src/opengl/qgl_symbian.cpp @@ -39,11 +39,10 @@ ** ****************************************************************************/ - #include "qgl.h" #include <fbs.h> #include <private/qt_s60_p.h> -#include <private/qpixmap_s60_p.h> +#include <private/qpixmap_raster_symbian_p.h> #include <private/qimagepixmapcleanuphooks_p.h> #include <private/qgl_p.h> #include <private/qpaintengine_opengl_p.h> @@ -437,7 +436,6 @@ void* QGLPixmapData::toNativeType(NativeType type) m_source = QVolatileImage(w, h, QImage::Format_ARGB32_Premultiplied); return m_source.duplicateNativeImage(); } - return 0; } |