diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 00:12:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 00:12:05 (GMT) |
| commit | 9abc55f373d11d9b329f164f6894812b94af7bce (patch) | |
| tree | 4d80b7c49c647ec52d43538859209247c0c57870 /dist | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| parent | e855b199319c932f2e9500235775f961bc32e41a (diff) | |
| download | Qt-9abc55f373d11d9b329f164f6894812b94af7bce.zip Qt-9abc55f373d11d9b329f164f6894812b94af7bce.tar.gz Qt-9abc55f373d11d9b329f164f6894812b94af7bce.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2 index b1c0159..aaaaacc 100644 --- a/dist/changes-4.6.2 +++ b/dist/changes-4.6.2 @@ -251,6 +251,14 @@ Qt for Windows CE Qt for Symbian -------------- + * [QTBUG-6556] Improve the DEF file handling scheme, to allow simple enable/ + disable of DEF file usage (for use _during development only_ to decouple + the need to update the DEF files at the precise point that symbols are + removed, therefore allowing builds by CI systems to succeed even if symbols + have been removed. This does not remove the need to update the DEF files + before release. NOTE: Builds generated using this flag are not binary + compatible with previous versions of Qt.) + - QProcess * [QTBUG-7667] Fixed no-timeout case for QProcess::waitForFinished. |