diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-09-30 12:00:23 (GMT) |
| commit | 801a3780c9d029a288f60ddc4485ce34bd7fa94f (patch) | |
| tree | ff0728320e1938908912506ab776299af6d45543 /src/gui/image/image.pri | |
| parent | 2ff6c9e8d89590c8180769bd54e545f40ca9a56f (diff) | |
| parent | 8d3d7d411491e50c1c6a62f473a1fa69a3ca2773 (diff) | |
| download | Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.zip Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.gz Qt-801a3780c9d029a288f60ddc4485ce34bd7fa94f.tar.bz2 | |
Merge branch '4.6' into lighthouse
Conflicts:
configure
src/gui/image/qpixmapdatafactory.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/gui/image/image.pri')
| -rw-r--r-- | src/gui/image/image.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 67f0699..634c3f3 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -24,7 +24,7 @@ HEADERS += \ image/qpixmap.h \ image/qpixmap_raster_p.h \ image/qpixmapcache.h \ - image/qpixmapcache_p.h \ + image/qpixmapcache_p.h \ image/qpixmapdata_p.h \ image/qpixmapdatafactory_p.h \ image/qpixmapfilter_p.h \ @@ -73,6 +73,7 @@ x11 { SOURCES += image/qpixmap_mac.cpp } symbian { + HEADERS += image/qpixmap_s60_p.h SOURCES += image/qpixmap_s60.cpp } |