diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-18 07:41:09 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-18 07:41:09 (GMT) |
| commit | 9cacde74f7de702689725882633073e60c0a2baa (patch) | |
| tree | 330d22dadbd28b14a7d8896823d1c33597e9993e /src/corelib/statemachine/qabstractstate.cpp | |
| parent | 006c8e22075112eff6230d8168d716e44a9e29d5 (diff) | |
| parent | 2c07b5d2cba8d8e499bd0861eefef12d4e00d99a (diff) | |
| download | Qt-9cacde74f7de702689725882633073e60c0a2baa.zip Qt-9cacde74f7de702689725882633073e60c0a2baa.tar.gz Qt-9cacde74f7de702689725882633073e60c0a2baa.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
Diffstat (limited to 'src/corelib/statemachine/qabstractstate.cpp')
0 files changed, 0 insertions, 0 deletions