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>
Tue, 13 Apr 2010 15:21:00 +0000 (17:21 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 15:21:00 +0000 (17:21 +0200)
commit455ced3c38ed19e91f066e0431efb6036d6b6fd3
tree617cebe6b1b684d6bdb525ff8aaae288bfb8e30c
parent70141f27e6151f7d7e635ef4ac99fb1f38a1f881
parent047bc9eaf10c6438d29fbd49e422adcc09866df1
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:
  Not possible to show selected text in virtual keyboard
  Export .flm files always if they are different
  Make qmake possible to build with mingw using qmake.pro