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 08:44:13 +0000 (10:44 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 08:44:13 +0000 (10:44 +0200)
commit10830900ce5ff361c52b8c244ba14e53e98722f0
tree5aeaeb0c9f3d4002d65e674e4d0fe3c4067223a5
parenta32798fa17b5d67c002a8910baf7b8dc85084691
parenta38cb0dbec7238903c62e8a08ecd6faecb58e9b2
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:
  Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.