Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 15:50:04 +0000 (17:50 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 15:50:04 +0000 (17:50 +0200)
commit02f3facbc114fdc1e12cb0abf5be7b0cf42ce0a4
treec74ff9371071411777f1c1919701e98ef0ce2a9d
parent8f011df08139bea59c12ae0804969334a9374dc8
parent693e94d0071f8d6dff48e608a0b11cbb2497f32e
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Post QResizeEvent from QSymbianControl::SizeChanged even when invisible
  Moved Symbian-specific .pro directive into symbian{} block