From 4772acadb91a04c4bb2ddc5914dd2b396ab8b674 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Thu, 3 Mar 2011 11:07:53 +0200
Subject: 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
---
 src/gui/image/image.pri | 6 +++---
 1 file 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
-- 
cgit v0.12

