Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 2 Aug 2011 16:03:43 +0000 (02:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 2 Aug 2011 16:03:43 +0000 (02:03 +1000)
commite8b18a1e0b78fab0a771b73cc5e005207324e6ee
tree2ff1ed00675f9f104da0c0e74c43f16d6a7915a9
parent29a5089b83b1b43ecf2c746dac8cadbbe4385553
parent08d4a7ba40be36d8d8ae63b3bbaeb7823441c8aa
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/text/qfontdatabase_s60.cpp