Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 31 Aug 2010 09:28:20 +0000 (11:28 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 31 Aug 2010 09:28:20 +0000 (11:28 +0200)
commit0b438841e98add45fbddce51e210aea0c97a1f91
treefd85a743bfb3917380b6134ee2a0b92956e3b2ba
parent9809aae54f9df283549c2f5d9e216b232471eed3
parentae574f7341f4f76a1f7de570cc3d56f77781e625
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix QtScript Date <--> QDateTime (local time) conversion