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>
Mon, 22 Nov 2010 11:13:50 +0000 (12:13 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Nov 2010 11:13:50 +0000 (12:13 +0100)
commite0bd60f6c8a489c5703b648fe2e2470763f67e37
tree6f7e7be222134fc9e0dfdff0041e985b21020910
parent9696376911ffc78b15b6a63929b0d83adfafe62e
parent4214d58abd394eea2793f05a554bd9885b53d418
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:
  Compile when USER_TIMER_MINIMUM isn't defined
  Docs: QTBUG-10866 Description of how AutoConnection is resolved.
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)