summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove font that may not exists in some OS X systemsJiang Jiang2011-11-131-1/+0
* Fix regression in styleName searchingJiang Jiang2011-11-092-24/+10
* Fix styleName listing with the same QtFontStyle::Key valueJiang Jiang2011-11-081-14/+17
* Fix localized font family access in OS XJiang Jiang2011-11-083-4/+39
* Fix to QtOpenGL crash on SymbianJani Hautakangas2011-11-082-3/+32
* Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXTJani Hautakangas2011-11-031-0/+3
* Add GL_EXT_texture_format_BGRA8888 support.Jani Hautakangas2011-11-031-1/+2
* Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"Samuel Rødal2011-11-032-45/+4
* Correction for effectiveBoundingRect() calculation for QGraphicsItemChristophe Oosterlynck2011-11-022-4/+45
* Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-0292-346/+929
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-0121-46/+61
| |\
| | * Missing icon in the designer documentationartoka2011-11-012-2/+4
| | * Fridge magnet example code snippet errorartoka2011-11-011-1/+1
| | * qpaintdevice-qt3.html documentation errorsartoka2011-11-011-11/+11
| | * QWebElement example missed informationartoka2011-11-011-1/+1
| | * QSPlitter style-sheet example was invalidartoka2011-11-011-1/+1
| | * Errors in QSqlDriver::handle examplesartoka2011-11-011-3/+3
| | * QGLColormap example was invalidartoka2011-11-011-2/+3
| | * QPointer made no mention of QWeakPointerartoka2011-11-011-1/+1
| | * Invalid links to http://developer.symbian.orgartoka2011-11-012-3/+3
| | * QNetworkDiskCache documentation missed informationartoka2011-11-011-2/+2
| | * QStyleSheet example used a property that is hidden.artoka2011-11-011-1/+1
| | * QList document referenced to non existing functionartoka2011-11-011-2/+2
| | * QXmlQuery::bindVariable documentation bugartoka2011-11-011-1/+2
| | * Fix multiple typos in QLineF documentation.artoka2011-11-011-3/+6
| | * Qmake project file docs lacked information.artoka2011-11-011-1/+9
| | * Documentation error in SSL documentartoka2011-11-011-1/+1
| | * Fix multiple typos in documentation.artoka2011-11-013-8/+8
| | * Fix for QVector::toList - code example documentation.artoka2011-11-011-2/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-014-41/+138
| |\ \
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-313-39/+136
| | |\ \
| | | * | Supporting parallel pointer event delivery on Symbianmread2011-10-313-39/+136
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-281-2/+2
| | |\ \ \ | | | |/ /
| | | * | Removed unix specific mmap use from QString benchmarkmread2011-10-281-2/+2
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-011-1/+1
| |\ \ \ \
| | * | | | SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-314-2/+116
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-314-2/+116
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-281-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-10-279-59/+127
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
| | | |\ \ \ \ \ \
| | | | * | | | | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
| | | | | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-217-62/+37
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix security problem on webpage due to bad JSCasper van Donderen2011-10-215-59/+2
| | | | | | * | | | | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-212-3/+35
| | | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-21132-716/+1892
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-311-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |