diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 11:13:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 11:13:50 (GMT) |
| commit | e0bd60f6c8a489c5703b648fe2e2470763f67e37 (patch) | |
| tree | 6f7e7be222134fc9e0dfdff0041e985b21020910 /src/corelib/tools/qlocale.cpp | |
| parent | 9696376911ffc78b15b6a63929b0d83adfafe62e (diff) | |
| parent | 4214d58abd394eea2793f05a554bd9885b53d418 (diff) | |
| download | Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.zip Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.tar.gz Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.tar.bz2 | |
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)
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
0 files changed, 0 insertions, 0 deletions