diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
| commit | 7104b7598f6c8d61d008edab227cfce3ec4442fc (patch) | |
| tree | e390a009bbc0826af59b105f7d5501a3f59028a3 /dist | |
| parent | b827967fef469f66a5a2f975bfafc3cdb82c4ffb (diff) | |
| parent | cb23151d3abfdbdf291abe8a1510592db2011927 (diff) | |
| download | Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.zip Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.gz Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
src/gui/styles/qmacstyle_mac.mm
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.7.0 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index 4965ef5..31130e8 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -224,7 +224,6 @@ Qt for Windows * Pipe handle leak fixed, when closing a QLocalSocket that still has unwritten data. (QTBUG-7815) * Fixed closing state for local sockets with unwritten data. (QTBUG-9681) - * Detection of Windows mobile 6.5 fixed. (QTBUG-8418) * Improved performance of writing to QLocalSocket. @@ -252,6 +251,7 @@ Qt for Windows CE * Huge performance penalty for QTabWidget fixed for Windows mobile 6.5. (QTBUG-8419) * QTabBar scroll button size has been fixed. (QTBUG-8757) + * Detection of Windows mobile 6.5 fixed. (QTBUG-8418) |