summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-03-03 09:07:53 (GMT)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-03-03 09:07:53 (GMT)
commit4772acadb91a04c4bb2ddc5914dd2b396ab8b674 (patch)
tree9d48eb18e7b021193226402390cd8e5abbc44d67 /src/gui/image
parented123142cd92e4f158385f5ed861a0a63745ee68 (diff)
downloadQt-4772acadb91a04c4bb2ddc5914dd2b396ab8b674.zip
Qt-4772acadb91a04c4bb2ddc5914dd2b396ab8b674.tar.gz
Qt-4772acadb91a04c4bb2ddc5914dd2b396ab8b674.tar.bz2
Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
BeginDataAccess() and EndDataAccess() is only available from S60 5.0 and QVolatileImage is not used on such platforms anyway. Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/image.pri6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 1ca832e..d99b1c6 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -75,11 +75,11 @@ else:symbian {
SOURCES += image/qpixmap_s60.cpp
}
-symbian {
- SOURCES += image/qvolatileimagedata_symbian.cpp
+!symbian|contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2) {
+ SOURCES += image/qvolatileimagedata.cpp
}
else {
- SOURCES += image/qvolatileimagedata.cpp
+ SOURCES += image/qvolatileimagedata_symbian.cpp
}
# Built-in image format support