summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-2630-72/+238
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-2531-103/+272
| |\
| | * Fixed compile error in runonphone.axis2010-08-241-0/+2
| | * Added an install target to runonphone.axis2010-08-241-1/+2
| | * Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2024-66/+99
| | |\
| | | * Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| | | * Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| | | * Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| | | * Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| | | * Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-206-37/+66
| | | |\
| | | | * qtconfig and qvfb internationalization fixesTasuku Suzuki2010-08-204-32/+59
| | | | * add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | * qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | * | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
| | | |/
| | * | Add a menu option to open remote files in the QML viewerAlan Alpert2010-08-202-0/+15
| | |/
| | * qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| | * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| * | Namespace compile fix for 00e954ca817f89958a8a8777d93d3843252dc88cFriedemann Kleint2010-08-231-1/+3
| * | Qt Designer/Integrations: Add properties for use by C++-IDEs.Friedemann Kleint2010-08-234-3/+79
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-196-39/+120
|\ \ \
| * \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1938-289/+971
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-181-1/+1
| | |\ \
| | | * | make error messages consistentOswald Buddenhagen2010-08-171-1/+1
| | * | | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-182-35/+95
| | |/ /
| | * | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+21
| | * | qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-19107-871/+1604
|\ \ \ \ | | |_|/ | |/| |
| * | | Designer: Add 'Simplify rich text' filter to rich text editor.Friedemann Kleint2010-08-175-27/+178
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1362-470/+1696
| |\ \ \ | | | |/ | | |/|
| | * | 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