summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 06:41:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 06:41:52 (GMT)
commit392ecc76cdbcef37ee492400a1b783106a37ad36 (patch)
tree0be89c7cbd3be3b85d59e7b9097391029d0f86fc /tools
parentf3fcb5b2ec2f8a16e93074e68e9f2aa2604b4ac3 (diff)
parent6ba29f785710fd894298d945e603439611e7859c (diff)
downloadQt-392ecc76cdbcef37ee492400a1b783106a37ad36.zip
Qt-392ecc76cdbcef37ee492400a1b783106a37ad36.tar.gz
Qt-392ecc76cdbcef37ee492400a1b783106a37ad36.tar.bz2
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 'tools')
0 files changed, 0 insertions, 0 deletions