summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-0910-17/+120
|\
| * Doc: we don't ship a qconfig executable in the Windows CE packagesJoerg Bornemann2010-04-091-3/+0
| * Fixed possible data corruption in the triangulating stroker.Trond Kjernåsen2010-04-091-4/+12
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-098-10/+108
| |\
| | * Fixed caching of QPainter patterns in the GL 2 engine.Trond Kjernåsen2010-04-071-1/+1
| | * Fixes CursorChange and TooltipChange events delivery for QGraphicsWidgetYoann Lopes2010-04-072-2/+88
| | * QTableView: fix spans corruption when removing spans.Olivier Goffart2010-04-072-5/+12
| | * Fixes painting artifacts when scaling a QGraphicsProxyWidget.Yoann Lopes2010-04-071-1/+1
| | * Fix <MemLeak> valgrind report shows memory leak for QImage::save().Stefano Pironato2010-04-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-04-071-1/+5
| | |\
| | | * Fix test sql for sql server.Bill King2010-04-071-1/+5
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-0911-20/+174
|\ \ \ \ | |/ / / |/| | |
| * | | Regressions in Global Object prototype accessKent Hansen2010-04-093-4/+144
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-093-2/+15
| * | | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-091-1/+1
| |\ \ \ |/ / / /
| * | | Fix typo in docs.Jason McDonald2010-04-091-1/+1
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-095-24/+76
|\ \ \ \ | |_|/ / |/| | |
| * | | Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| * | | Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-0711-89/+71
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-073-52/+25
|\ \ \ \
| * | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-063-1/+27
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-063-1/+27
| |\ \ \ |/ / / /
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-063-1/+27
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-061-1/+1
|\ \ \ \
| * | | | Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-063-12/+5
|\ \ \ \ \
| * | | | | Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-064-38/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-062-2/+1
| |\ \ \ \
| * | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | | | | * Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| | | |_|/ | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
| | * | | QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-051-14/+11
| |\ \ \ |/ / / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-031-14/+11
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-011-14/+11
| | |\ \ \
| | | * | | Partially revert "Remove qWait functions as it is used in QTRY_* macros."Toby Tomkins2010-04-011-172/+314
| | | * | | Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-01100-821/+1581
| | | |\ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-019-3/+365
| | | |\ \ \ \
| | | * | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-011-327/+182
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-052-0/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-032-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| * | | | | qDebug() << myPointF would remove spaces in following arguments.David Faure2010-04-031-1/+1
|/ / / / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-011-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |