summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 14:38:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 14:38:46 (GMT)
commitffcbe13f0adc7ada8f04b74ed60660b033ee242f (patch)
treedfc3dd5ff923d8cf8420e7fe23041332187d0f69 /tests/benchmarks
parent9b8fcaa5e9b6fe348df40683e4c8a72e4ba95c89 (diff)
parentf65a036ff7c4023a0603d2887b29bfe7e182034a (diff)
downloadQt-ffcbe13f0adc7ada8f04b74ed60660b033ee242f.zip
Qt-ffcbe13f0adc7ada8f04b74ed60660b033ee242f.tar.gz
Qt-ffcbe13f0adc7ada8f04b74ed60660b033ee242f.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Mac: fix bic breakage Mac: add missing .mm file Mac: add missing header file Allow QTextDocument to resolve URLs to the current working dir. Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."" Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"" Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"" Revert "Revert "Improve QUrl handling of local file paths"" Cocoa: remove warnings Autotest, Mac: added more native key event testing Cocoa: Glyph for "Enter" is wrong in QKeySequence Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu bar Cocoa: Add support for native application event filter
Diffstat (limited to 'tests/benchmarks')
0 files changed, 0 insertions, 0 deletions