diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-10 23:00:14 (GMT) |
| commit | ad925d41019d5e5c47143ab91f775f970995ad0d (patch) | |
| tree | ad05cea02ddf9c87b832fc7111bb1b09f5203408 /src/qt3support/canvas/q3canvas.cpp | |
| parent | b7d91c0d798bc10dd4f8a750723285076fb96935 (diff) | |
| parent | 38e1ed3b51d6aad46912eb548490d038e58203d9 (diff) | |
| download | Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.zip Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.gz Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/qt3support/canvas/q3canvas.cpp')
| -rw-r--r-- | src/qt3support/canvas/q3canvas.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp index 959c435..1b4706d 100644 --- a/src/qt3support/canvas/q3canvas.cpp +++ b/src/qt3support/canvas/q3canvas.cpp @@ -1030,7 +1030,7 @@ void Q3Canvas::setUpdatePeriod(int ms) The advance takes place in two phases. In phase 0, the Q3CanvasItem::advance() function of each Q3CanvasItem::animated() - canvas item is called with paramater 0. Then all these canvas + canvas item is called with parameter 0. Then all these canvas items are called again, with parameter 1. In phase 0, the canvas items should not change position, merely examine other items on the canvas for which special processing is required, such as |