summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/qfiledialog_mac.mm
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-24 01:12:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-24 01:12:57 (GMT)
commit9d26b5ad31a946ef631ca29da7379571267efddf (patch)
tree133092cc0d8a4b2e96f04c0d1c7ee689dd996536 /src/gui/dialogs/qfiledialog_mac.mm
parentb270e0f4f3db56a4854782036cdb4ceacb7874ff (diff)
parentce432e1799111cbed492e46bb62d8dfb40585a10 (diff)
downloadQt-9d26b5ad31a946ef631ca29da7379571267efddf.zip
Qt-9d26b5ad31a946ef631ca29da7379571267efddf.tar.gz
Qt-9d26b5ad31a946ef631ca29da7379571267efddf.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite loop in QMoviePrivate::next(). Added int overloads to QPoint operator* and operator*=. tst_qmessagebox: add debug to know why it fails QMessageBox wrong Show/Hide Details button label
Diffstat (limited to 'src/gui/dialogs/qfiledialog_mac.mm')
0 files changed, 0 insertions, 0 deletions