diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 21:01:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 21:01:08 (GMT) |
| commit | 01cf14ef278f564936eff9a392679526fe14e530 (patch) | |
| tree | 04a6186a813d6994647099a8f56d47ac0edb2549 /src/gui | |
| parent | 720d56486c3a3fd2d4d6517b8805ff96d3c6da60 (diff) | |
| parent | cafcb49b3f46915fef5106cfaa14a01079e537bc (diff) | |
| download | Qt-01cf14ef278f564936eff9a392679526fe14e530.zip Qt-01cf14ef278f564936eff9a392679526fe14e530.tar.gz Qt-01cf14ef278f564936eff9a392679526fe14e530.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation on Mac 32-bit.
Doc fix, ensure that the \obsolete tag is placed correctly
Added note to make QList destructor virtual in version 5
Fix handling of Evaluation licenses on the Windows configure.exe
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 96b9373..06b7438 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3609,6 +3609,8 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect) } /*! + \obsolete + Draws the items \a items in the scene using \a painter, after the background and before the foreground are drawn. \a numItems is the number of items in \a items and options in \a options. \a options is a list of @@ -3617,7 +3619,7 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect) The default implementation calls the scene's drawItems() function. - \obsolete Since Qt 4.6, this function is not called anymore unless + Since Qt 4.6, this function is not called anymore unless the QGraphicsView::IndirectPainting flag is given as an Optimization flag. |