summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2061-3211/+878
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1918-168/+730
| |\
| | * Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1817-168/+728
| | |\
| | | * Implement bookmark manager widget.kh12010-02-178-52/+606
| | | * Fix memmory leak.kh12010-02-171-0/+1
| | | * Fix spacing.kh12010-02-171-0/+3
| | | * Prevent renaming the bookmarks menu root item, it's just a placeholder.kh12010-02-172-4/+17
| | | * Fix broken set last shown pagen when the last page was about:blank.kh12010-02-171-2/+3
| | | * Move launch with external app in base class.kh12010-02-176-103/+82
| | | * Make sure the bookmarks menu updates on add/ remove as well.kh12010-02-171-4/+6
| | | * Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.kh12010-02-171-3/+10
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1942-3080/+125
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-1971-175/+9934
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1871-152/+9911
| | | |\ \ \ | | | | |/ /
| | | * | | Compile fix with namepaceshjk2010-02-181-2/+2
| | | * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-21/+21
| | * | | | Add support for startDragDistance in qmlviewer.Kaj Grönholm2010-02-191-0/+4
| | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1741-3060/+101
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | qmlviewer: build on symbianMichael Brasser2010-02-171-0/+1
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-1/+1
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1639-3053/+89
| | | | |\ \
| | | | * | | Fix QTBUG-8090, improve original patch effectiveness.Warwick Allison2010-02-161-1/+1
| | | * | | | Conditionally link webkit on winceAaron Kennedy2010-02-171-1/+4
| | | | |/ / | | | |/| |
| | | * | | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-1623-3049/+1
| | | * | | Mobility 404Wolfgang Beck2010-02-161-0/+4
| | | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1621-23/+103
| | | |/ /
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1548-1056/+1968
| | | |\ \
| | | * | | Not exported in Qt 4.6.2, push to next release.Warwick Allison2010-02-151-5/+6
| * | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1882-163/+9916
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-181-3/+9
| * | | | | Added --range and --single arguments to qttracereplay.Samuel Rødal2010-02-181-9/+63
| * | | | | Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| | |/ / / | |/| | |
* | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2013-128/+873
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-195-0/+279
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-195-0/+279
| | |\ \ \ \ \
| | | * | | | | Cetest extensions for Windows Mobile device power operations.ninerider2010-02-193-0/+190
| | | * | | | | Remote lib extensions for Windows Mobile device power operations.ninerider2010-02-192-0/+89
| * | | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-192-0/+297
| * | | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-192-0/+225
| * | | | | | | Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-192-225/+0
| * | | | | | | Revert "Factored epocRoot implementation out of qmake"axis2010-02-192-297/+0
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-198-128/+594
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-181-1/+49
| | * | | | | | Added implementation of epocRoot() function to configureGareth Stockwell2010-02-183-2/+17
| | * | | | | | Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
| | * | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-182-0/+297
| | * | | | | | Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-182-0/+225
| | |/ / / / /
* | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1910-52/+35
|\ \ \ \ \ \ \ | |/ / / / / /