diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 20:49:16 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 20:49:16 +1000 |
| commit | a3cd7065c5b630d9d949cc53db36f5c2d091c9fc (patch) | |
| tree | fbf4f2d9b3e6bdbddf287771ef5f5a5e28cd3a3b /doc/src/snippets/code/doc_src_examples_imageviewer.cpp | |
| parent | fed237ecdd891df6ed4bd1e8e5f5b9a414e12a22 (diff) | |
| parent | 62f17a11be4ff2f545148a9e14a0d4806398765a (diff) | |
| download | qt4-tools-a3cd7065c5b630d9d949cc53db36f5c2d091c9fc.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: QFileDialog: fix filename filter not applied correctly
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