summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-198-576/+29
|\
| * Rename qml executable to qmlviewerKai Koehne2010-05-192-2/+4
| * Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-185-18/+18
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-186-556/+7
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-1/+5
| | |\
| | | * Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | * | Move stuff from QML viewer to plugins.Warwick Allison2010-05-175-555/+1
| | * | Fix to work with file: URLs (eg. from qml -qmlbrowser)Warwick Allison2010-05-171-0/+1
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-1838-1198/+1223
|\ \ \ | |/ /
| * | Print icon in doc pages has no effect.kh12010-05-173-0/+3
| * | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| |/
| * Add new logo for QML Launcher (Mac OS X)Kai Koehne2010-05-143-0/+3
| * Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-145-17/+18
| * Remove skins from qml launcher.Kai Koehne2010-05-144-271/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-143-3/+7
| |\
| | * Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-142-2/+6
| | * Revert "Use raster graphicssystem for qml.app on OS X."Michael Brasser2010-05-141-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1317-842/+824
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-1213-68/+347
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1217-840/+822
| | | |\
| | | | * REG 4.7: Edit widgets icon no longer in toolbar.Friedemann Kleint2010-05-121-0/+1
| | | | * Merge remote branch 'mainline/4.7' into 4.7Morten Johan Sørvig2010-05-128-61/+301
| | | | |\
| | * | | | Doc: Adding loading image to search textboxMorten Engvoldsen2010-05-121-3/+3
| | | |/ / | | |/| |
| | * | | Doc: Update on web templateMorten Engvoldsen2010-05-111-1/+1
| | * | | Doc: Fixed tables and images for the new docsMorten Engvoldsen2010-05-111-19/+22
| | * | | qdoc: Yet another revision of the top doc page.Martin Smith2010-05-112-35/+35
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-102-2/+4
| | |\ \ \
| | | * | | Doc: Updates to the html template and javascriptMorten Engvoldsen2010-05-102-2/+4
| | * | | | qdoc: Another revision of the top doc page.Martin Smith2010-05-101-7/+6
| | |/ / /
| | * | | qdoc: Fixed annotated list generation to use <td>, not <th>.Martin Smith2010-05-071-2/+2
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-071-11/+49
| | |\ \ \
| | | * | | Doc: Chages to search feature, css and table orderMorten Engvoldsen2010-05-071-11/+49
| | * | | | qdoc: Reorganized examples panel.Martin Smith2010-05-071-9/+9
| | |/ / /
| | * | | Doc: updating html and search featureMorten Engvoldsen2010-05-061-27/+1
| | * | | doc: Second attempt to begin reorganizing the top doc page.Martin Smith2010-05-062-16/+14
| | * | | Doc: Changes to the HTML outputMorten Engvoldsen2010-05-052-38/+30
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-051-2/+2
| | |\ \ \
| | | * | | Fix build key on Windows with MinGW.Daniel Molkentin2010-05-051-1/+1
| | | * | | correct misleading note in configure on WindowsPeter Hartmann2010-05-051-1/+1
| | * | | | doc: Began reorganization of the top doc page.Martin Smith2010-05-051-13/+6
| | |/ / /
| | * | | qdoc: Removed [module name] from class ref pages.Martin Smith2010-05-051-0/+3
| | * | | Doc: Updating style and HTML in CSS and qdocMorten Engvoldsen2010-05-041-6/+6
| | * | | qdoc: Fixed the alphabet index in the compact list.Martin Smith2010-05-041-9/+4
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-042-13/+37
| | |\ \ \
| | | * | | qdoc: Fixed some breadcrumbs.Martin Smith2010-05-041-0/+1
| | | * | | qdoc: Fixed class list problem.Martin Smith2010-05-042-13/+36
| | * | | | Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0413-770/+723
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0310-28/+94
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-031-3/+7
| | | |\ \ \
| | | * | | | qdoc: Added more API topics. Are these important?Martin Smith2010-05-033-4/+11