summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change copyrights from Nokia to Digia4.6Sergio Ahumada2012-11-279574-161612/+161536
* Change licenses and license headers from Nokia to DigiaSergio Ahumada2012-11-166-166/+165
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-182-36/+66
|\
| * Fixed unescaped backslashes in testcase.prfRohan McGovern2011-01-171-2/+2
| * Fix `make check' for debug-and-release on Windows.Rohan McGovern2011-01-171-2/+16
| * Move `check' target for autotests into testcase.prfRohan McGovern2011-01-172-35/+52
| * Revert "Backporting TESTARGS feature from 4.7"João Abecasis2011-01-171-1/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-121-0/+1
|\ \ | |/
| * Backporting TESTARGS feature from 4.7João Abecasis2011-01-121-0/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-128990-9063/+9063
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-118990-9063/+9063
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2010-12-201-0/+2
|\ \ | |/
| * embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-11-263-5/+5
|\ \ | |/
| * QLocalSocket/Win: do not emit error() when no error actually occurredJonathan Liu2010-11-261-2/+2
| * Doc: fix typoJoerg Bornemann2010-11-262-3/+3
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-242-0/+8
|\
| * Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-11-222-2/+22
|\
| * Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-272-0/+36
|\
| * Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| * Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-132-79/+90
|\
| * Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-10-121-0/+0
|\
| * Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-124-16/+4
|\ \ | |/ |/|
| * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-113-0/+14
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-113-0/+14
| |\ |/ /
| * Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-111-1/+1
|\ \
| * | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-10-1012-64/+572
|\ \ | |/ |/|
| * Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| * qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-081-1/+1
| * Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| * Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-071-0/+1
|\
| * Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-012-0/+9
|\ \ | |/
| * Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-2312-35/+235
|\
| * Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2212-35/+235
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-09-174-52/+89
|\
| * Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| * Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| * Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
View Lorry Controller Status