diff options
| author | mread <qt-info@nokia.com> | 2010-07-02 11:50:23 +0100 |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-02 11:50:23 +0100 |
| commit | 65316c0fcf9f0a406fd714622407e2b0e767fe7b (patch) | |
| tree | b22c5f1d6d314a972302b8a996bde43dc3ddd2af /src/gui/painting/qgraphicssystem.cpp | |
| parent | 36f4d17a139c58cf00d3d9222dd2d35603ac09e8 (diff) | |
| parent | 1636e03a2fda5108cb4389689a327e65c47dfe0e (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts fixed:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/painting/qgraphicssystem.cpp')
| -rw-r--r-- | src/gui/painting/qgraphicssystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp index bd9e7fc539..f06e3096f0 100644 --- a/src/gui/painting/qgraphicssystem.cpp +++ b/src/gui/painting/qgraphicssystem.cpp @@ -79,5 +79,9 @@ QPixmapData *QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixelType typ return 0; } +QPixmapData *QGraphicsSystem::createPixmapData(QPixmapData *origin) +{ + return createPixmapData(origin->pixelType()); +} QT_END_NAMESPACE |