Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
authorSami Merila <sami.merila@nokia.com>
Mon, 23 May 2011 09:22:32 +0000 (12:22 +0300)
committerSami Merila <sami.merila@nokia.com>
Mon, 23 May 2011 09:22:32 +0000 (12:22 +0300)
commit41eb5c5de54d71b23e90a377df9e0caf396a65fa
tree609ebe77473b0797a216f36017aa86126dfe0ae3
parentca0b5b4dceaa9d7c152d4ccb58184ee04ab1a6b4
parenta1c9e88596241ca356986c74b057e6330eae6137
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
src/gui/styles/qs60style.cpp
src/gui/styles/qs60style_s60.cpp