diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 04:16:55 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 04:16:55 +1000 |
| commit | 7a2f721d74892c7eeff9aba370b6c081612c634b (patch) | |
| tree | a8c8d5d5e8ed4bb68710bc30edba6e8c34621823 /doc/src/snippets/code/doc_src_examples_imageviewer.cpp | |
| parent | fff467981fe515974e722e1d092a916f6a8f5dcc (diff) | |
| parent | 680023c4921019614948c277cde5498645836cb9 (diff) | |
| download | qt4-tools-7a2f721d74892c7eeff9aba370b6c081612c634b.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix typo in docs: occurred.
Cocoa: fix qtabwidget auto test failure
Cocoa: fix qwidget auto test failures
Cocoa: Fix qgraphicsproxywidget auto test
Use Q_SLOTS instead of slots in public headers.
Fix a11y crash: dock doesn't always have a widget.
Fix typo in comment.
Mac: respect WA_ShowWithoutActivating flag
Remove misleading and incorrect information from dropMimeData docs.
Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
Mac: switch raster off as default paint engine
Diffstat (limited to 'doc/src/snippets/code/doc_src_examples_imageviewer.cpp')
0 files changed, 0 insertions, 0 deletions