diff options
| author | axis <qt-info@nokia.com> | 2009-11-09 08:28:40 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-09 08:28:40 (GMT) |
| commit | 7fdfa58b958b658feb7b20dd7a7322d235fe4bea (patch) | |
| tree | 6c38ed48f7c234ad480aa8ce178b9a00b14d2440 /examples/gestures/imagegestures/imagewidget.h | |
| parent | 7ea04bf5c065a037b2db667572e1947f1a1b8b2e (diff) | |
| parent | 68409c24211b4639832ce86113c33a247bb68950 (diff) | |
| download | Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.zip Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.tar.gz Qt-7fdfa58b958b658feb7b20dd7a7322d235fe4bea.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/gui/painting/qblendfunctions.cpp
Diffstat (limited to 'examples/gestures/imagegestures/imagewidget.h')
| -rw-r--r-- | examples/gestures/imagegestures/imagewidget.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/gestures/imagegestures/imagewidget.h b/examples/gestures/imagegestures/imagewidget.h index 56e2316..7a68488 100644 --- a/examples/gestures/imagegestures/imagewidget.h +++ b/examples/gestures/imagegestures/imagewidget.h @@ -93,6 +93,7 @@ private: float verticalOffset; float rotationAngle; float scaleFactor; + float currentStepScaleFactor; //! [class definition end] }; //! [class definition end] |