summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-2338-69/+176
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-224-21/+43
| |\
| | * Compile when USER_TIMER_MINIMUM isn't definedBradley T. Hughes2010-11-221-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-194-21/+43
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-194-21/+43
| | | |\
| | | | * Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | * silence compiler warningsHarald Fernengel2010-11-192-7/+7
| | | | * Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1934-48/+133
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1926-38/+102
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix possible missing glyphs in raster engine glyph cacheEskil Abrahamsen Blomfeldt2010-11-192-10/+13
| | | * | Fix possible corrupted text when gl glyph cache becomes fullEskil Abrahamsen Blomfeldt2010-11-195-7/+38
| | | * | Check correctly before including SSE4.2 header.Mike McQuaid2010-11-181-2/+6
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1823-24/+50
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1723-24/+50
| | | | |\
| | | | | * Fixed crash when destroying QGLWidgetThorbjørn Lindeijer2010-11-171-1/+2
| | | | | * Prevent crash in GL 2 engine when stroking null rectangle.Samuel Rødal2010-11-171-0/+3
| | | | | * Compile fix.Samuel Rødal2010-11-171-1/+1
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1721-22/+44
| | | | | |\
| | | | | | * Doc: Fixing typoSergio Ahumada2010-11-1618-20/+20
| | | | | | * Fix possible missing glyphs in text when using GL engineEskil Abrahamsen Blomfeldt2010-11-163-2/+24
| | * | | | | Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | * | | | | Add missing symbols to QtOpenGL arm def fileJoona Petrell2010-11-191-0/+5
| | * | | | | Add missing symbols to QtOpenGL emulator def fileJoona Petrell2010-11-191-3/+8
| | * | | | | Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| | * | | | | Fix parent bug for QDeclarativeOpenMetaObjectMarco Bubke2010-11-181-0/+2
| | * | | | | Add missing symbols in QtGui emulator def fileJoona Petrell2010-11-181-0/+6
| | |/ / / /
* | | | | | Doc: Removed incorrect statement about the C locale.David Boddie2010-11-221-2/+0
* | | | | | Doc: Fixed broken link by referring to the errors() method instead.David Boddie2010-11-221-3/+4
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-196-13/+19
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-181-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Use GLIBC functions on any GLIBC architecture.Oswald Buddenhagen2010-11-171-3/+3
| | |/ / /
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-175-10/+16
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-171-8/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix license text.Jason McDonald2010-11-171-8/+7
| | | |/
| | * | Added missing symbols in QtCore and QtGui def files needed by fix made to QT-...Joona Petrell2010-11-162-1/+4
| | * | Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| | * | VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+2
| | * | Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| | |/
* | | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
|/ /
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-161-1/+1
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-151-1/+1
| |\
| | * doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1535-206/+236
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
| | |\ \
| | | * | Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1523-133/+125
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-1520-176/+251
| | | |\ \ \ \