diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 21:39:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 21:39:52 (GMT) |
| commit | 98bf29b55b33c538f5d3329899292996b048b498 (patch) | |
| tree | 984c9e4d3f08c6952924018ca489afb2e3229c28 /src/gui/kernel/qcursor_win.cpp | |
| parent | 540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b (diff) | |
| parent | 981a83d7832e8cd1ee7bcd42dfaba62f0b04f2c1 (diff) | |
| download | Qt-98bf29b55b33c538f5d3329899292996b048b498.zip Qt-98bf29b55b33c538f5d3329899292996b048b498.tar.gz Qt-98bf29b55b33c538f5d3329899292996b048b498.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:
Suppress a warning about killing a timer that isn't active.
ICC: Don't print warning 1259 since it's too annoying.
Autotest: Add some comments about this obscure test.
Add a warning about trying to release a timer ID that isn't active
Don't need to set FD_CLOEXEC since qt_safe_* will have done that.
Check for null-pointer to avoid a crash in textedit demo.
Diffstat (limited to 'src/gui/kernel/qcursor_win.cpp')
0 files changed, 0 insertions, 0 deletions