diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 15:37:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 15:37:09 (GMT) |
commit | e2ff3adad12ad10363a19d2c49d0ed3bdfe20d68 (patch) | |
tree | 1b688135c560b44b0398627f09b0fc5af26f6a8c /src/corelib/io/qfile.h | |
parent | db2cef1df7fe3e9068d95acd1227a4585373be59 (diff) | |
parent | a315c693d0f3dd64711b8459d86b89ddc48e8c1a (diff) | |
download | Qt-e2ff3adad12ad10363a19d2c49d0ed3bdfe20d68.zip Qt-e2ff3adad12ad10363a19d2c49d0ed3bdfe20d68.tar.gz Qt-e2ff3adad12ad10363a19d2c49d0ed3bdfe20d68.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (46 commits)
Fix crash in indeterminate progressbars on windows
Fix infinite loop in qmake when reading malformed .ts files.
Fix timer regression for indeterminate progressbars
Improve performance of bilinear upscaling of images with neon.
Fix libinfixed usage in Symbian when def files are used
Made documentation of QPixmap::createMaskFromColor match behaviour.
Improve performance of bilinear downscaling of images with neon.
Document the 'variant' basic type
Add double type to QML Basic Types docs
Remove redundant docs
Doc: Added a missing license header.
More testing for KeyNavigation attached properties.
Add tests for ListView.indexAt() and GridView.IndexAt()
runonphone: Only print the modprobe instructions on linux
reword: Make the USB serial device enumeration work on OS X, too
runonphone: Check that the device->config is valid before dereferencing it
Remove few compile warnings
Fix using QFileDialog statics in Symbian.
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
...
Diffstat (limited to 'src/corelib/io/qfile.h')
0 files changed, 0 insertions, 0 deletions