Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 29 Jan 2011 22:44:11 +0000 (08:44 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 29 Jan 2011 22:44:11 +0000 (08:44 +1000)
commit84b81d47829d56cbd5568034161bf25898ab0824
tree7e6700c6d6a0a7cd32ae8422d0a35cfe21c14a41
parent8bf770a1c9c28781aa8bfdea13df5194fac13573
parentbdf3782b40b0fc2ebfda960be08c90b549cfd970
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix potential networking crash due to null-pointer dereference
  Revert "Improve timer ID safety by using a serial counter per ID."
  Invalidate QScriptPrograms when engine is destroyed
  Fix alignment issue causing crash in QtScript/JavaScriptCore
  Restore Qt 4.6 behaviour: exec() always enters the event loop.
  Make syncqt not complain about missing header macros.