summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Audio (osx); In pull mode emit readyRead() for each period received.Justin McPherson2010-06-161-2/+2
* AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
* Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-152-3/+3
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-102-2/+1
| | | | | |\
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-10155-1611/+280760
| | | | | | |\
| | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-1/+1
| | | | | | | |\
| | | | | | * | | Regression Qt4.4: QMovie does not render properly some mng filesKurt Korbatits2010-06-101-1/+0
| | | | | | | |/ | | | | | | |/|
| | | | | | * | QMovie cpu usage up to 100%Kurt Korbatits2010-06-101-1/+1
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-142-10/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | beautify tst_QLocalSocket::writeToClientAndDisconnectJoerg Bornemann2010-06-141-9/+2
| * | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-142-0/+28
| * | | | | | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-142-1/+22
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-141-4/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | fix detection of header filesDavid Fries2010-06-141-4/+3
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
| |\ \ \ \ \ |/ / / / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix incorrect line breaking in QtWebKit.Pierre Rossi2010-06-112-9/+114
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-125-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-115-5/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Allow to build Qt in static with mingwThierry Bastian2010-06-115-5/+5
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-123-12/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-113-12/+57
| |\ \ \ \ \ |/ / / / / /
| * | | | | Thread safety for QFontEngineS60Shane Kearns2010-06-113-12/+57
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1010-81/+116
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-102-1/+4
| * | | | QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamedJoerg Bornemann2010-06-102-6/+8
| * | | | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-102-7/+19
| * | | | QLocalServer: make many simultaneous connection attempts work on WindowsJoerg Bornemann2010-06-102-1/+6
| * | | | tst_QLocalSocket::threadedConnection autotest stabilizedJoerg Bornemann2010-06-101-26/+12
| * | | | tst_qlocalsocket: pro files of client / server examples fixedJoerg Bornemann2010-06-102-12/+0
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-103-29/+68
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-100-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge commit 'v4.6.3' into 4.6Thiago Macieira2010-06-090-0/+0
| |\ \ \ \
* | \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| |\ \ \ \ \ |/ / / / / /
| * | | | | Merge commit 'v4.6.3' into 4.6Jason McDonald2010-06-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...v4.6.3Simon Hausmann2010-06-013-2/+12
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-012-12/+28
| | * | | | Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | * | | | Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-075-0/+108
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fix translations from some header files being omittedOswald Buddenhagen2010-06-075-0/+108
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-392/+370
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
|/ / / / /