diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 19:25:14 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 19:25:14 (GMT) |
commit | 471528b2b678918a699653802c1b8f70d522825d (patch) | |
tree | 5ff7f3800fa6b1096775c4079381fe45ffcb85fa /src/plugins/kbddrivers | |
parent | 1b7c80fb09e962c7a05249d4b2779b84701ed326 (diff) | |
parent | c8fc2b44213ded1bd789b4cd3106c4f0b0bfa78b (diff) | |
download | Qt-471528b2b678918a699653802c1b8f70d522825d.zip Qt-471528b2b678918a699653802c1b8f70d522825d.tar.gz Qt-471528b2b678918a699653802c1b8f70d522825d.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: (25 commits)
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
...
Diffstat (limited to 'src/plugins/kbddrivers')
0 files changed, 0 insertions, 0 deletions