diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 09:35:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 09:35:09 (GMT) |
| commit | be627ce374da1e192c740a6b59f4bab6b12798c3 (patch) | |
| tree | b06ff42b0d629354ab8e548f86247227135af444 /src/corelib | |
| parent | 1448e19b3613ab7c5498c17c619586d03ec46d18 (diff) | |
| parent | a978ce3d7c6f6825e723df2a986ad17c9cb6af31 (diff) | |
| download | Qt-be627ce374da1e192c740a6b59f4bab6b12798c3.zip Qt-be627ce374da1e192c740a6b59f4bab6b12798c3.tar.gz Qt-be627ce374da1e192c740a6b59f4bab6b12798c3.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:
Add a note to the Linguist docs stating XLIFF 1.0 is not supported
remove spurious empty lines in the linguist tools' output
don't use qWarning() - or even qFatal()! - gratuitously.
Styled item view backgrounds in Gtk+
Ensure that we only have one QLayoutStruct struct by renaming the other
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions