summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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.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
| | | * | Temporary hackiesh solution to prevent BOM in the xml data.Denis Dzyubenko2010-01-062-2/+5
| | | * | Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-1/+1
| | | * | Fixes a crash when setting focus on a widget with a focus proxy.Denis Dzyubenko2010-01-061-6/+13
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-066-11/+32
| | | |\ \
| | | * | | Update copyright year to 2010Jason McDonald2010-01-063331-3341/+3341
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-0643-563/+1022
| | |\ \ \ \
| | | * | | | QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-061-2/+4
| | | * | | | Revert "QStyleSheetStyle: Fixed some text croped when having padding with nat...Olivier Goffart2010-01-061-1/+1
| | | * | | | Use QFile:rename when moving items in QFileystemModel.Alexis Menard2010-01-061-2/+1
| | | * | | | Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-063-73/+3
| | | * | | | Fix default filter selection when using HideNameFilterDetails option.Alexis Menard2010-01-061-15/+28
| | | * | | | Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| | | * | | | Improved initial startup time for a QGLWidget ontop of EGL/X11.Trond Kjernåsen2010-01-061-5/+111
| | | * | | | Document the QGraphicsView::IndirectPainting flagOlivier Goffart2010-01-062-1/+11
| | | * | | | Display broken symlinks in the filesystem model.Alexis Menard2010-01-051-1/+1
| | | * | | | Merge branch 'QT-2261' into 4.6Jan-Arve Sæther2010-01-051-2/+2
| | | |\ \ \ \