summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Add missing trace, small cleanup.kh12010-06-023-20/+34
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-252-1/+44
|\
| * Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| * Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-211-0/+1
| * Add license headers for .qml files.Jason McDonald2010-05-211-0/+41
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-2045-1042/+112
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-198-576/+29
| |\
| | * 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/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1935-434/+48
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-28/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| | * | | | Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1924-430/+1
| | * | | | Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | * | | | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
| | | |/ / | | |/| |
| * | | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-28/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-1838-1198/+1223
| | |\ \ \ | | | |/ /
| | * | | Removed mediaservices.Kurt Korbatits2010-05-181-28/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-182-4/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge commit 'qt/4.7' into 4.7Miikka Heikkinen2010-05-179-291/+30
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Shadow building on Symbian fixes: part 2 - populate bin dir correctlyIain2010-05-141-1/+28
| | * | | Support device aliases in EPOCDEVICEMiikka Heikkinen2010-05-141-3/+6
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-1938-1198/+1221
|\ \ \ \ \ | |/ / / /
| * | | | 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