summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-0538-602/+951
|\
| * Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0580-408/+1129
| |\
| * | Removed invalid public slots section.David Boddie2011-04-051-2/+0
| * | Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| * | Fixed string-int concatenation issue.David Boddie2011-04-051-1/+1
| * | Merge branch '4.7' of ../qt-doc-team-threading into 4.7David Boddie2011-04-052-6/+6
| |\ \
| | * \ Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-29957-2463/+59705
| | |\ \
| | * | | Doc: Minor fix to title.David Boddie2011-03-291-1/+1
| | * | | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-1810-196/+205
| | |\ \ \
| | * | | | Doc: Squashed commit of Roland Wolf's threading tutorial.David Boddie2011-03-172-6/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-2946-349/+1191
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| * | | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| * | | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
| * | | | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
* | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-0510-48/+153
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-0510-48/+153
* | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-014-33/+123
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-0118-87/+106
| |\ \ \ \ \
| * | | | | | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
* | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-014-6/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-014-6/+8
* | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-316-30/+41
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-315-24/+35
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-311-15/+19
| | |\ \ \ \ \ \
| | | * | | | | | QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-304-9/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Corrected case mismatch.axis2011-03-291-1/+1
| | | * | | | | | Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | | * | | | | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-29679-16869/+33989
| | | |\ \ \ \ \ \
| | | | * | | | | | Removed useless Exit button in Symbian^3Titta Heikkala2011-03-281-0/+8
| | | * | | | | | | Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
| * | | | | | | | | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
* | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-3010-76/+128
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-301-25/+71
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-3079-416/+1603
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-309-51/+57
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-304-44/+29
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| | | * | | | | | | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-291-1/+11
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-284-6/+17
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Update changes for 4.7.3Timo Turunen2011-03-281-0/+12
| | | * | | | | | | | | | directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
| | | * | | | | | | | | | fix -enable-stdcall-fixup usageMark Brand2011-03-281-2/+2
| | | * | | | | | | | | | Report that an update is needed if no update was doneThiago Macieira2011-03-281-1/+1
* | | | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-3051-215/+676
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /