diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:41:52 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:41:52 +0200 |
| commit | 392ecc76cdbcef37ee492400a1b783106a37ad36 (patch) | |
| tree | 0be89c7cbd3be3b85d59e7b9097391029d0f86fc /src/gui/image/qnativeimage.cpp | |
| parent | f3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3 (diff) | |
| parent | 6ba29f785710fd894298d945e603439611e7859c (diff) | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix crash when using Q_GLOBAL_STATIC(QWidget...)
Removed the need for S60main.rsc resource file in Symbian.
Diffstat (limited to 'src/gui/image/qnativeimage.cpp')
0 files changed, 0 insertions, 0 deletions