Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Jan 2011 16:26:46 +0000 (02:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Jan 2011 16:26:46 +0000 (02:26 +1000)
commit697e236c096d62137fdd155f5ef8d72a26b8636b
treeda6dd70894562e15ebeccc4a1aa0cb90339fbd8f
parentf8696912869c702ddc5ac664659346554e96addf
parentc981098ea0353aead43c93ac81835451515b63d0
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix def file names for libinfixed testlib
  Generate freeze targets in Symbian