summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Reverted two commits that were pushed to the wrong branch.Denis Dzyubenko2010-01-083-59/+13
* Use the new QTextCodec api in the QXmlStreamWriter.Denis Dzyubenko2010-01-082-10/+2
* Added new functions to QTextCodec that accept ConversionFlags.Denis Dzyubenko2010-01-082-3/+57
* Fixes: Fix spinbox with NoButton style in QGtkStyleJens Bache-Wiig2010-01-081-44/+53
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0845-266/+498
|\
| * Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-081-0/+7
| * Fix broken QGLWidget::renderPixmap on Mac/CarbonMorten Johan Sørvig2010-01-081-4/+16
| * Fixes: Setting any style sheet breaks checkbox positioningJens Bache-Wiig2010-01-081-5/+7
| * Fixes: MenuItem size fixes and missing separator with Gtk+Jens Bache-Wiig2010-01-083-28/+33
| * QNAM HTTP: just use the expirationDate in the code that validates the cacheThiago Macieira2010-01-081-2/+6
| * QNAM HTTP: change the caching semantics to match documentationThiago Macieira2010-01-081-7/+10
| * QNAM HTTP: fix the caching algorithm from RFC 2616Thiago Macieira2010-01-081-4/+10
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-0823-153/+222
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-0817-77/+139
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-07245-3888/+7140
| | | |\
| | | | * Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-07244-3880/+7132
| | | | |\
| | | | * | Fix warning in qfilesystemmodel_p.hJustin McPherson2010-01-071-8/+8
| | | * | | QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | |/ /
| | | * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0616-60/+112
| | | * | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-068-9/+19
| | * | | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| | * | | Fix performance regression in _q_polishItems.Alexis Menard2010-01-072-6/+12
| | * | | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| | * | | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
| | * | | Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-061-1/+1
| | | |/ | | |/|
| * | | Avoid repeatedly calling LookupAccountSid in QFSFileEngine::ownerRitt Konstantin2010-01-071-10/+21
| * | | improve readability a bit moreRitt Konstantin2010-01-071-8/+8
| * | | fix styling; improve readabilityRitt Konstantin2010-01-071-36/+33
| * | | make it possible to retrieve name of the user who owns the fileRitt Konstantin2010-01-071-1/+2
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-0711-16/+124
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-072-8/+13
| |\ \ \
| | * | | Fix bugs evidenced by change to keep flush errors on QFile::closeJoão Abecasis2010-01-072-1/+4
| | * | | Don't drop errors from flush on QFile::closeJoão Abecasis2010-01-071-3/+6
| | * | | Avoid double-buffering in QFileJoão Abecasis2010-01-071-4/+3
| * | | | Doc: Added the QAudio namespace to the multimedia module documentation.David Boddie2010-01-071-0/+2
| |/ / /
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-073344-3965/+4609
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-06112-1231/+3205
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-18123-2173/+2977
| |\ \ \ \ \
| * | | | | | Doc: Made corrections to documentation style and clarified some points.David Boddie2009-12-181-7/+7
* | | | | | | doc: Explained parameter value defaults where appropriate.Martin Smith2010-01-081-5/+20
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-071-0/+2
|\ \ \ \ \ \
| * | | | | | Prospective Qt/Mac build fixSimon Hausmann2010-01-071-0/+2
* | | | | | | doc: Removed incorrect \inmodule command.Martin Smith2010-01-071-2/+0
|/ / / / / /
* | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-077-1/+64
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-073337-3952/+4529
|\ \ \ \ \ \
| * | | | | | Fixes a crash when destroying and creating QApplication.Denis Dzyubenko2010-01-075-19/+21
| * | | | | | Make an empty QUrl also be considered non-detached (d == 0).Thiago Macieira2010-01-071-1/+1
| * | | | | | Improve QUrl constructing performance by making empty URLs have d==0.Thiago Macieira2010-01-071-15/+119
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-073332-3356/+3369
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | QIODevice: Fix readAll()Markus Goetz2010-01-061-2/+3