diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-06-24 11:52:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-06-24 11:52:41 +0200 |
| commit | cf2f72f4f61f3a9e0e7573379c33bb341eeba7be (patch) | |
| tree | 06fbd459f62f87344e7db973a0a9f3050cece825 /src/gui/image/image.pri | |
| parent | 164728f711136356a6c3482f762321b01c9d82dd (diff) | |
| parent | 705b0f958a6071341b10cbd51917e1378356491b (diff) | |
| download | qt4-tools-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
Diffstat (limited to 'src/gui/image/image.pri')
| -rw-r--r-- | src/gui/image/image.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 72738c9fa8..17b7da3acc 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -77,8 +77,8 @@ else:mac { SOURCES += image/qpixmap_mac.cpp } else:symbian { - HEADERS += image/qpixmap_s60_p.h - SOURCES += image/qpixmap_s60.cpp + HEADERS += image/qpixmap_raster_symbian_p.h + SOURCES += image/qpixmap_raster_symbian.cpp } !symbian|contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2) { |