summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-2213-24/+529
|\
| * 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/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-upstream' into 4.7-docA-Team2010-11-17390-12069/+9055
| | |\ \ \
| * | | | | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-17526-6294/+13909
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-161-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-15187-1579/+1842
| | |\ \ \ \ \
| | * | | | | | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501
| | * | | | | | Doc: Correcting references to Qt Declarative module.Morten Engvoldsen2010-11-157-16/+16
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-156-78/+170
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-126-78/+170
| | | |\ \ \ \ \ \
| | * | | | | | | | doc: Stated that the destructor does not call close().Martin Smith2010-11-121-1/+4
| | |/ / / / / / /
| * | | | | | | | Doc: Minor fixes to style.David Boddie2010-11-171-2/+2
| * | | | | | | | Doc: Updated the DirectFB documentation to reflect version changes.David Boddie2010-11-171-3/+3
* | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-220-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-11-222-2/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| |/ / / / / / / / /
* | | | | | | | | | 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' 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