diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 14:06:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 14:06:40 (GMT) |
| commit | cfee61fd74d7fe73f0de13356fe683bc8ae91f92 (patch) | |
| tree | 08a4d1764e69b97f85d581e42602bb180cb642ba /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 00ffa3cee315e9d99bb6c5d3666ab984b2be2bf7 (diff) | |
| parent | f894fb8228e35a43b2baf80666ca5bca6e987064 (diff) | |
| download | Qt-cfee61fd74d7fe73f0de13356fe683bc8ae91f92.zip Qt-cfee61fd74d7fe73f0de13356fe683bc8ae91f92.tar.gz Qt-cfee61fd74d7fe73f0de13356fe683bc8ae91f92.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
Better fix for build!=src Makefile generation
Make input mask cursor blink
Fix QGLWidget::renderPixmap() on Windows.
Fix rules for recreating the Makefile in a subdir
Disable some tests that require high floating point precision.
Replace the truncate function with fuzzierCompare().
Rework how Qt handles GL extensions.
More changelog additions for QtWebKit
Make compile on symbian/Linux
Removed pointless image comparison in raster colorize filter.
Improved performance of translating device coordinate graphics effects.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index c8d2061..2d34b80 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -609,6 +609,7 @@ public: QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, QGraphicsEffect::PixmapPadMode mode) const; + QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const; QGraphicsItem *item; QGraphicsItemPaintInfo *info; |