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>
Fri, 26 Mar 2010 08:55:01 +0000 (09:55 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Mar 2010 08:55:01 +0000 (09:55 +0100)
commit8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1
tree1ae28a4c94b7712005d3a0a1d1edb11c3ee48912
parent2aaad2476345e0c44da488ed33c71b8f378a582c
parentaaf0f47930a44f5f36bb825e10a5067eeced6718
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:
  Changed pkg_prerules to not use default_deployment for vendor ID
  Enable armcc version specific compler options for Symbian