diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 08:16:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 08:16:05 (GMT) |
| commit | b8238ec7e41d483a9166eb7aebbf911f36976cdc (patch) | |
| tree | b3f8f08911714ccd653f1f2df4876cf2638b5090 /src/gui/painting/qgraphicssystem_raster_p.h | |
| parent | d28057dc6f282c2cc129eae40a4fb1555fef455c (diff) | |
| parent | 03c1445ed4be734a82cea59d107c51a4be43c5f4 (diff) | |
| download | Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.zip Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.tar.gz Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation with QT_NO_KEYWORDS
Replaced sample text for Japanese font
Fix the #ifdef position.
Deactivate the auto-test on problematic platforms.
Enable the unified toolbar with the raster
configure: Don't use character class when looking for QMAKE_CONF_COMPILER
Moving the resetInternalData slot to QAbstractProxyModel
Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
Emit beginResetModel before updating the strings.
Send the hoverLeave not properly sent on the widget inside QGPW.
Diffstat (limited to 'src/gui/painting/qgraphicssystem_raster_p.h')
0 files changed, 0 insertions, 0 deletions