diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 00:30:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 00:30:12 (GMT) |
| commit | bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (patch) | |
| tree | fbe4f71381c380f295a959fac6c5ce72a62ba20c /src/gui/image/qicon.cpp | |
| parent | 6100e83f3cbf40199da3078c1954a4dc1f77cb8f (diff) | |
| parent | 040ad2dc679ebfb3dec7685edf617fc57bb66ccf (diff) | |
| download | Qt-bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c.zip Qt-bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c.tar.gz Qt-bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c.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: (24 commits)
Empty commit to trigger a rebuild in the CI system
Use case-insensitive comparison for the "data" scheme in URLs
tst_bic: Fix building on Mac 64
Fix building of tst_QTcpSocket
Autotest: some improvements to timeout testing of tst_QTcpSocket
Revert "Optimized pixmapcache key generation for icons and styles"
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.
...
Diffstat (limited to 'src/gui/image/qicon.cpp')
0 files changed, 0 insertions, 0 deletions