summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-22109-5160/+7250
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-226-28/+49
| |\
| | * 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.7Peter Yard2010-11-2265-641/+928
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | | |\
| | | | | * Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| | | | | * Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | * silence compiler warningsHarald Fernengel2010-11-192-7/+7
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-181-14/+34
| | | | | |\
| | | | | | * Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
| | * | | | | Docs: QTBUG-10866 Description of how AutoConnection is resolved.Peter Yard2010-11-221-5/+4
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-22103-5132/+7201
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update qml visual tests on mac.Yann Bodson2010-11-22102-5131/+7199
| | * | | | DocAaron Kennedy2010-11-221-1/+2
| |/ / / /
* | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-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-water-team into 4.7Sami Merila2010-11-191-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-11-191-4/+5
| |\ \ \ \ \ \ \
| * | | | | | | | Fix code styleJan-Arve Sæther2010-11-191-1/+1
* | | | | | | | | QS60Style: Null pointer crash when using itemviews in some cases (pt2)Sami Merila2010-11-191-2/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-1926-600/+780
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' into QTBUG-15333Jan-Arve Sæther2010-11-191-2/+2
| |\ \ \ \ \ \ \