diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-15 06:09:15 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-15 06:09:15 (GMT) |
commit | 0a6d0d1d9aba54890908ec0ec02e066c060360c3 (patch) | |
tree | 1e484868f13b5453bbb7d171220317e7d6126d2a /doc/src/howtos/accelerators.qdoc | |
parent | 6100e83f3cbf40199da3078c1954a4dc1f77cb8f (diff) | |
parent | b0f4dab4c825650c3a7a72b87508bf6f3e5ffd50 (diff) | |
download | Qt-0a6d0d1d9aba54890908ec0ec02e066c060360c3.zip Qt-0a6d0d1d9aba54890908ec0ec02e066c060360c3.tar.gz Qt-0a6d0d1d9aba54890908ec0ec02e066c060360c3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "More improvements to pixmap cache key generation"
More improvements to pixmap cache key generation
More 4.7 stuff.
Fix for autotest failure in qwidget::saveRestoreGeometry()
Optimized pixmapcache key generation for icons and styles
doc: Another upgrade of the top page and overviews.
Mac: restoreGeometry()
[Regression] Build failure on Mac Carbon
doc: Added some \briefs to how-to docs.
Some 4.7 changes.
Updated changelog.
Cherry pick fix for MOBILITY-932 from Qt Mobility.
Cherry pick fix for MOBILITY-962 from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Bearer management changes from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Added snippet labels to QML Dial example.
Fixed documentation typo.
Diffstat (limited to 'doc/src/howtos/accelerators.qdoc')
-rw-r--r-- | doc/src/howtos/accelerators.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/howtos/accelerators.qdoc b/doc/src/howtos/accelerators.qdoc index 65f1def..b6ef5c2 100644 --- a/doc/src/howtos/accelerators.qdoc +++ b/doc/src/howtos/accelerators.qdoc @@ -42,6 +42,7 @@ /*! \page accelerators.html \title Standard Accelerator Keys + \brief Recommended accelerator keys. \ingroup best-practices |