diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-07 12:34:25 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-07 12:34:25 (GMT) |
| commit | 5695b50d2f21e94e8c284148367d2656d1158722 (patch) | |
| tree | d29f2194a812a27d78f143bde046ae577d6c61ff /src/gui/painting/qpaintengineex.cpp | |
| parent | 350f97874544396a99cf82b47eb9a6e50838a88a (diff) | |
| parent | 75b41faff44a1488d88eca6e910d4b617cb42221 (diff) | |
| download | Qt-5695b50d2f21e94e8c284148367d2656d1158722.zip Qt-5695b50d2f21e94e8c284148367d2656d1158722.tar.gz Qt-5695b50d2f21e94e8c284148367d2656d1158722.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/gui/painting/qpaintengineex.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index d712669..195be0a 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -932,7 +932,7 @@ void QPaintEngineEx::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, con fill(path, brush); } -void QPaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints) +void QPaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints /*hints*/) { qreal oldOpacity = state()->opacity; QTransform oldTransform = state()->matrix; |