diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 06:45:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 06:45:31 (GMT) |
| commit | 06012741fc9acd783fb1ad45321d2c6179eedfdc (patch) | |
| tree | 1077db234780b57b646c77ebe262914c10493dc0 /src/src.pro | |
| parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
| parent | 471528b2b678918a699653802c1b8f70d522825d (diff) | |
| download | Qt-06012741fc9acd783fb1ad45321d2c6179eedfdc.zip Qt-06012741fc9acd783fb1ad45321d2c6179eedfdc.tar.gz Qt-06012741fc9acd783fb1ad45321d2c6179eedfdc.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/src.pro')
0 files changed, 0 insertions, 0 deletions