summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | qdbus: short forms to get/set propertiesGiuseppe Bilotta2009-12-151-12/+36
| * | | | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-153-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Assistant: Topic chooser links correctly to Urls with identical titles.ck2009-12-142-12/+13
| * | | | | | | | | | | | | | qhelpgenerator: Don't insert identical indices.ck2009-12-141-2/+12
| * | | | | | | | | | | | | | Assistant: Performance improvements in qhelpgenerator.ck2009-12-142-13/+16
| * | | | | | | | | | | | | | Assistant: Added rebuild-search-index command line option.ck2009-12-103-3/+40
| * | | | | | | | | | | | | | Assistant: Make doc file watching work for the intended use case.ck2009-12-092-1/+75
| * | | | | | | | | | | | | | Assistant: Try to reload open pages on doc file update.ck2009-12-095-10/+23
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-093-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-083-5/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Assistant: Allow search tab to be displayed on start-up.ck2009-12-081-2/+2
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Assistant: Don't re-load saved pages that don't exist anymore.ck2009-12-081-11/+13
| * | | | | | | | | | | | | | | Assistant: Add "shared" directory to dependency list.ck2009-12-071-0/+1
| * | | | | | | | | | | | | | | Assistant: Use tracing macro in all functions.ck2009-12-0718-0/+472
| * | | | | | | | | | | | | | | Assistant: Logical re-structuring of start-up code.ck2009-12-076-148/+172
| * | | | | | | | | | | | | | | Cleanup, no functional change.kh12009-12-071-23/+30
| * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-0511-28/+170
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Assistant: More small refactorings + compile fix.ck2009-12-041-37/+49
| * | | | | | | | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-032-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Assistant: Another small refactoring.ck2009-12-031-14/+33
| * | | | | | | | | | | | | | | | | Assistant: Small refactoring to prepare for upcoming functional change.ck2009-12-031-18/+24
| * | | | | | | | | | | | | | | | | Assistant: Compile fix for namespaced Qt.ck2009-12-032-0/+8
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-0310-36/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-0210-36/+85
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Assistant: Encapsulate accesses to help engine.ck2009-12-0326-772/+1224
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | trolltech => nokiaOswald Buddenhagen2009-11-271-1/+1
* | | | | | | | | | | | | | | | | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-011204-2312/+6626
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-221-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-216-51/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge from upstreamShane Kearns2010-01-213-23/+45
| | * | | | | | | | | | | | | | | | Merge from upstreamShane Kearns2010-01-213-22/+33
| | * | | | | | | | | | | | | | | | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| | * | | | | | | | | | | | | | | | Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
| * | | | | | | | | | | | | | | | | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| * | | | | | | | | | | | | | | | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-197-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Bump version to 4.6.2.Jason McDonald2010-01-197-11/+11
| | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-151-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-141-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-131211-1225/+1225
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-131-1/+2
| | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-151-1/+1
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131211-1225/+1225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091211-1225/+1225
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071211-1225/+1225
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |