diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 15:14:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 15:14:53 (GMT) |
| commit | a0348b63c48dbd686a6a5b49b0438e6a6fc0d9a9 (patch) | |
| tree | 57afabd5186080ee2ed84c3c95c7a6b8d08422c0 /src/gui/image | |
| parent | 405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6 (diff) | |
| parent | 357be9c19457adc7d48c16898985d0b7ddf0aeee (diff) | |
| download | Qt-a0348b63c48dbd686a6a5b49b0438e6a6fc0d9a9.zip Qt-a0348b63c48dbd686a6a5b49b0438e6a6fc0d9a9.tar.gz Qt-a0348b63c48dbd686a6a5b49b0438e6a6fc0d9a9.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:
Making orbit input methods work with Qt apps with -no-s60
Using the remaining valid data to construct the QTime object when msec parsing failed.
QProgressDialog text is too close to dialog border
fix for broken input method loading
Avkon Removal DEF file updates
Stub version of QS60Style
Avkon removal configured with -no-s60
QFileDialog broken in landscape in N8
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmapdatafactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp index 8014660..7498a7c 100644 --- a/src/gui/image/qpixmapdatafactory.cpp +++ b/src/gui/image/qpixmapdatafactory.cpp @@ -53,7 +53,7 @@ #ifdef Q_WS_MAC # include <private/qpixmap_mac_p.h> #endif -#ifdef Q_WS_S60 +#ifdef Q_OS_SYMBIAN # include <private/qpixmap_s60_p.h> #endif @@ -82,7 +82,7 @@ QPixmapData* QSimplePixmapDataFactory::create(QPixmapData::PixelType type) return new QRasterPixmapData(type); #elif defined(Q_WS_MAC) return new QMacPixmapData(type); -#elif defined(Q_WS_S60) +#elif defined(Q_OS_SYMBIAN) return new QS60PixmapData(type); #else #error QSimplePixmapDataFactory::create() not implemented |