summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
|\
| * Add -mediaservice argument to configure.Andrew den Exter2010-02-242-1/+13
* | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-1/+15
* | Simplify QML element registration headersAaron Kennedy2010-02-242-0/+4
* | Compile warning-- for qmlviewerLeonardo Sobral Cunha2010-02-241-1/+0
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2442-396/+396
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2414-63/+634
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2414-63/+634
| |\ \ | | |/
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-234-0/+522
| | |\
| | | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-232-0/+297
| | | * Factored readRegistryKey implementation out of qmakeaxis2010-02-232-0/+225
| | * | Merge remote branch 'origin/master'Thiago Macieira2010-02-231-2/+2
| | |\ \ | | | |/
| | * | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-222-2/+28
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2210-62/+85
| | |\ \
| | | * \ Merge branch 'master' of git:qt/qtThiago Macieira2010-02-2127-197/+927
| | | |\ \
| | | * \ \ Merge remote branch 'origin/master'Thiago Macieira2010-02-2061-3211/+878
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-196-35/+44
| | | |\ \ \ \
| | | | * | | | qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-196-35/+44
| | | * | | | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-196-52/+0
| | | |/ / / /
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-186-5/+22
| | | |\ \ \ \
| | | * | | | | qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-185-10/+76
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-232-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Avoiding PlatSec warnings for Symbian devicesAleksandar Sasha Babic2010-02-231-1/+1
| * | | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-237-9/+30
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-221-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-221-2/+2
* | | | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-212-225/+0
* | | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-212-297/+0
| |_|_|_|/ |/| | | |
* | | | | 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