summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-124-43/+185
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-129-25/+125
| |\
| | * update Russian translations for Qt and toolsRitt Konstantin2010-08-111-2/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-113-41/+171
| |\ \
| | * \ Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-111-2/+2
| | |\ \
| | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0917-151/+218
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-061-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0510-11/+294
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed qdoc warnings.David Boddie2010-08-051-5/+2
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0469-1964/+1469
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1646-798/+342
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1252-1496/+5481
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-3015-178/+528
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Synchronize HTML templates for each language.David Boddie2010-06-283-37/+170
* | | | | | | | | | | | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-123-29/+5
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-1112-26/+223
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-111-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fix loading of module configsOswald Buddenhagen2010-08-111-2/+0
| | * | | | | | | | | | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-117-9/+98
| |/ / / / / / / / /
| * | | | | | | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Translation work for 4.7Pierre Rossi2010-08-061-0/+40
| * | | | | | | | Some french translationsPierre Rossi2010-08-061-5/+17
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-061-4/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-063-3/+7
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| * | | | | | | | | | doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-061-0/+55
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+5
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0614-140/+96
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Increase maximum heap size of QML ViewerJoona Petrell2010-08-051-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | qdoc: Ensured that text is encoded correctly.David Boddie2010-08-101-9/+9
* | | | | | | | | qdoc: Fixed non-well-formed markup.David Boddie2010-08-092-14/+13
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| |/ / / / / / |/| | | | | |
* | | | | | | qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
* | | | | | | qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-055-116/+95
|/ / / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-045-4/+20
|\ \ \ \ \ \
| * | | | | | Fix the remote command delimiter, this has cahnged at some point.kh12010-08-042-2/+2
| * | | | | | Assistant: Revert previous commit, issue was already fixed.ck2010-08-041-2/+1
| * | | | | | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-042-0/+17
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-046-6/+272
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-4/+12
| * | | | | | runonphone - catch ctrl-c and terminate remote process before exitShane Kearns2010-08-045-2/+260
| | |_|_|_|/ | |/| | | |
* | | | | | Assistant: Include QML docsck2010-08-041-1/+2
* | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-032-1/+48
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0312-79/+137
| |\ \ \ \ \
| * | | | | | Made changes to qdoc to allow it to accept a "style level" flagJerome Pasion2010-08-032-1/+48
* | | | | | | Doc: removing empty links in bread crumbMorten Engvoldsen2010-08-031-3/+3
| |/ / / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-038-60/+61
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-027-59/+60
| |\ \ \ \ \ \
| | * | | | | | doc: Fixed many qdoc errors.Martin Smith2010-08-021-0/+1