summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1946-56/+345
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1935-43/+300
| |\
| | * Doc: Fixing typo.Sergio Ahumada2010-11-191-1/+1
| | * 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
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1832-30/+253
| | |\
| | | * 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-1831-28/+247
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1731-28/+247
| | | | |\
| | | | | * 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-172-0/+26
| | | | | * Compile fix.Samuel Rødal2010-11-171-1/+1
| | | | | * Documentation update for new switching events.Michael Dominic K2010-11-172-1/+31
| | | | | * Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.Michael Dominic K2010-11-174-2/+142
| | | | | * 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/+46
| | | | | |\
| | | | | | * Doc: Fixing typoSergio Ahumada2010-11-1620-22/+22
| | | | | | * Fix possible missing glyphs in text when using GL engineEskil Abrahamsen Blomfeldt2010-11-163-2/+24
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1911-13/+45
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Move qmlvisualaids to another repoAlan Alpert2010-11-199-391/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-197-10/+32
| | |\ \ \ \ \
| | | * | | | | Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
| | | * | | | | 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
| | * | | | | | Initial commit of qmlvisualaidsAlan Alpert2010-11-199-0/+391
| | * | | | | | Add a test on QWSAlan Alpert2010-11-182-3/+5
| | |/ / / / /
| | * | | | | Fix parent bug for QDeclarativeOpenMetaObjectMarco Bubke2010-11-181-0/+2
| | * | | | | Add missing symbols in QtGui emulator def fileJoona Petrell2010-11-181-0/+6
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-19395-12125/+9087
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1817-584/+560
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1815-564/+540
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fine-tune the tests being run on the CI system.Alan Alpert2010-11-181-36/+10
| | | * | | | Standardize selection color in visual testAlan Alpert2010-11-1814-528/+530
| | | |/ / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-182-20/+20
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Use GLIBC functions on any GLIBC architecture.Oswald Buddenhagen2010-11-171-3/+3
| | | * | | tst_qnetworkreply: Fix ugly testMarkus Goetz2010-11-171-17/+17
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-17390-12069/+9055
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-174-19/+18
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-174-19/+18
| | | |\ \ | | |/ / /
| | | * | Fix license text.Jason McDonald2010-11-173-18/+17
| | | * | Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-17386-12050/+9037
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Remove pointSize from visual testsAlan Alpert2010-11-173-2/+2
| | | * | Update visuals for X11Alan Alpert2010-11-1741-1404/+1404
| | | * | Added missing symbols in QtCore and QtGui def files needed by fix made to QT-...Joona Petrell2010-11-162-1/+4
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-162-0/+3
| | | |\ \
| | | | * | Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| | | * | | Remove some excess pngsAlan Alpert2010-11-1615-0/+0
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-1635-145/+206
| | | |\ \