diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 11:58:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 11:58:36 (GMT) |
| commit | d7a00eaec6d94fd2383d6f815f792d26b7161f0c (patch) | |
| tree | 05cf6c669ffd61a98a5d153235a1a980a9a48fa3 /src | |
| parent | f118ed2fe65fb62a8865b11b293e4910397f5964 (diff) | |
| parent | 4772acadb91a04c4bb2ddc5914dd2b396ab8b674 (diff) | |
| download | Qt-d7a00eaec6d94fd2383d6f815f792d26b7161f0c.zip Qt-d7a00eaec6d94fd2383d6f815f792d26b7161f0c.tar.gz Qt-d7a00eaec6d94fd2383d6f815f792d26b7161f0c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/image.pri | 6 |
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 |