summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-08-083-33/+55
|\
| * Doc: Fixes to Qt tutorialGeir Vattekar2011-07-292-32/+54
| * Fixed external link to DevNet Wiki.Jerome Pasion2011-07-281-1/+1
* | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
* | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
|/
* Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
* Doc: Removed the Google Analytics script.David Boddie2011-07-191-13/+1
* Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
* Doc: Added a link to the How to Learn Qt document.David Boddie2011-07-191-1/+2
* Doc: Fixed shader program snippet.David Boddie2011-07-191-2/+2
* Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.David Boddie2011-07-181-2/+2
* Doc: Moved general notes about character conversion.David Boddie2011-07-181-10/+13
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-07-1868-849/+1871
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-151-6/+22
| |\
| | * Fix the timeout calculation for futexes in QMutex.Thiago Macieira2011-07-151-6/+22
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-07-152-4/+5
| |\
| | * namespace fixJoerg Bornemann2011-07-142-4/+5
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-145-52/+33
| |\ \
| | * | fix buildRitt Konstantin2011-07-141-10/+2
| | * | get rid of unwanted dependencies and unused header includesRitt Konstantin2011-07-143-26/+6
| | * | sync qws_dataDir() with coreapp's internal qws_dataDir()Ritt Konstantin2011-07-141-6/+19
| | * | Documentation fix.Casper van Donderen2011-07-141-10/+6
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-141-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Added Solaris build fix to the changes file.Martin Pejcoch2011-07-141-1/+2
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-144-18/+9
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-144-18/+9
| | |\ \ \ | |/ / / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-131-0/+1
| | |\ \ \
| | | * | | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-121-2/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Compensate for different rounding rule in CG engineJiang Jiang2011-07-121-2/+8
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-07-122-16/+0
| | |\ \ \ \
| | | * | | | Remove broken link to Symbian.org documentation.Casper van Donderen2011-07-122-16/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-123-44/+117
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6
| | | * | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| | | * | | | Optimize text layout.Michael Brasser2011-07-113-25/+71
| | | * | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-115-2/+13
| | |\ \ \ \ \
| | | * | | | | Backporting fix for QTBUG-18716Tomi Vihria2011-07-115-2/+13
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-131-11/+7
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-07-13203-3017/+5655
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-129-50/+79
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'review/master' into stagingJiang Jiang2011-07-129-50/+79
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-111-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| | | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-115-21/+30
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | | | * | | | | | | Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-082-2/+2
| | | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-082-18/+39
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Use more numerically robust algorithm to compute QBezier::pointAt().Samuel Rødal2011-07-082-18/+39