summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed QDesktopWidget autotest.axis2010-01-081-1/+1
* Fixed a doc error.axis2010-01-081-1/+0
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0844-538/+935
|\
| * Enable building with MSVC2008Shane Kearns2010-01-083-11/+7
| * Added mention of Symbian binary packages to INSTALL fileMiikka Heikkinen2010-01-081-0/+4
| * Fix for QTBUG-5870 QGraphicsProxyWidget does not show children onJani Hautakangas2010-01-081-3/+10
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0739-524/+914
| |\
| | * Deploy sqlite3.sis instead of sqlite3.dll in SymbianMiikka Heikkinen2010-01-072-4/+3
| | * Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-072-12/+23
| | * Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0731-506/+870
| | |\
| | | * Merge branch 'mmfphonon' into 4.6Gareth Stockwell2010-01-0631-506/+870
| | | |\
| | | | * Implemented node disconnection in Phonon MMF backendGareth Stockwell2009-12-0820-194/+348
| | | | * Removed dead code from Phonon MMF backendGareth Stockwell2009-12-081-12/+2
| | | | * Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.Gareth Stockwell2009-12-082-2/+25
| | | | * Implemented support for playlist handling in Phonon MMF backendGareth Stockwell2009-12-0812-170/+129
| | | | * Mediaplayer: enqueue all entries from .ram file before starting playbackGareth Stockwell2009-12-082-5/+12
| | | | * Changed call sequence of seeking in Phonon MMF backend, for streamingGareth Stockwell2009-12-082-19/+11
| | | | * Implemented buffer status notifications in Phonon MMF backendGareth Stockwell2009-12-089-62/+162
| | | | * Added support for streaming playback to Phonon MMF backendGareth Stockwell2009-12-088-6/+30
| | | | * Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp...Gareth Stockwell2009-12-082-34/+34
| | | | |\
| | | | | * Symbian: More i18n strings work.Frans Englich2009-12-072-34/+34
| | | | * | Phonon MMF: leaves during object construction throw exceptionsGareth Stockwell2009-12-082-9/+7
| | | | * | Removed stale TODO comments from Phonon MMF backendGareth Stockwell2009-12-083-4/+1
| | | | |/
| | | | * Fixed bug which caused Phonon backend error messages to be suppressedGareth Stockwell2009-12-022-6/+7
| | | | * Added error strings to Phonon MMF backendGareth Stockwell2009-12-028-51/+170
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-082-1/+5
|\ \ \ \ \
| * | | | | Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.Gunnar Sletta2010-01-081-1/+3
| * | | | | Fix a painter warningPierre Rossi2010-01-071-0/+2
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-0825-124/+186
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-07434-5810/+18922
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-07433-5802/+18914
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | 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-0624-90/+142
| * | | | | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-0616-22/+32
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-078-78/+104
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | 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-073-6/+29
| * | | | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| * | | | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| * | | | 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
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-0657-819/+1587
|\ \ \ \
| * | | | QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-062-2/+31
| * | | | Revert "QStyleSheetStyle: Fixed some text croped when having padding with nat...Olivier Goffart2010-01-062-58/+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-063-15/+70
| * | | | Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2