diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 17:49:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 17:49:58 (GMT) |
commit | 5c91e32a6238fd112a7282443214c8686cda51de (patch) | |
tree | c908f07b98cdf193b571575808ea682b153345f0 /.gitignore | |
parent | e70f1b1b0525e8745ccdc66d397c86c15b942493 (diff) | |
parent | 1d85e1ce92e6df1af97bde7542467f40f7003975 (diff) | |
download | Qt-5c91e32a6238fd112a7282443214c8686cda51de.zip Qt-5c91e32a6238fd112a7282443214c8686cda51de.tar.gz Qt-5c91e32a6238fd112a7282443214c8686cda51de.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:
Fix: define hotSpot for Gestures on Mac
Fix warnings in PSQL driver: handle VersionUnknown in switch
Fix warning in ODBC driver: passing NULL to non-pointer.
QNAM FTP: switch to binary mode before sending a SIZE command
Change the D-Bus signal filter to return NOT_YET_HANDLED for signals
Check if the interpolators have already been deleted.
Improve timer ID safety by using a serial counter per ID.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions