summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Assistant: Fix use of uninitialized address bar.ck2010-05-171-92/+103
* Assistant: Enable switching between pages via an in-page combo box.ck2010-05-147-21/+95
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-052-3/+15
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-042-3/+15
| |\
| | * only add phonon and scripttools dependencies if they're available, otherwise ...Romain Pokrzywka2010-05-031-3/+7
| | * qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-031-0/+8
* | | Sync against latest Qt Creator.kh12010-05-0417-762/+785
|/ /
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-0410-57/+154
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-0210-57/+154
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-308-13/+67
| | |\
| | | * doc: Fixed some qdoc errors.Martin Smith2010-04-301-0/+1
| | | * qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-302-3/+3
| | | |\
| | | | * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | * | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | | |/
| | | * qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | | * qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| | * | Don't disable the symbian media backend.Andrew den Exter2010-04-291-16/+20
| | |/
| | * Fix compile.Aaron McCarthy2010-04-281-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-274-29/+68
| | |\
| | | * qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-279-49/+50
| | | |\
| | | * | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-273-3/+50
* | | | | added closing parenthesis in helpviewer_qtb.cppZeno Albisser2010-05-031-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-04-2827-915/+1449
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-04-2827-915/+1449
| |\ \ \ \
| | * | | | Assistant: Fix line endings.ck2010-04-274-698/+698
| | * | | | Assistant: Fix license headers.ck2010-04-272-28/+52
| | * | | | Assistant: Don't display close button when it's not functional.ck2010-04-261-2/+5
| | * | | | Assistant: Fix some merge artifacts.ck2010-04-264-11/+13
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1ck2010-04-23155-1499/+5136
| | |\ \ \ \
| | * | | | | Assistant: Get rid of tabs.ck2010-04-1225-646/+1336
| | * | | | | Assistant: Move search widget into the dock area.ck2010-04-126-291/+107
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-04-2836-438/+960
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-2736-438/+960
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-274-16/+25
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-264-15/+24
| | | |\ \ \
| | | | * | | Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-263-6/+7
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | | * | Fix hidden menu on embedded.Warwick Allison2010-04-232-7/+17
| | | | | | * | Location of binary is not on installed-content import path.Warwick Allison2010-04-231-2/+0
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-264-29/+12
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2618-134/+387
| | | |\ \ \ \ \ \
| | | | * | | | | | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | | | |/ / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-231-13/+30
| | | |\ \ \ \ \ \
| | | * | | | | | | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-221-40/+39
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44