summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-265-12/+12
|\
| * Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-2639-325/+421
| |\
| * | fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-244-11/+11
| |\ \
| | * | Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| | * | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-262-2/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '4.6'Miikka Heikkinen2010-02-262-2/+4
| |\ \ \
| | * | | Fix for cetest.David Laing2010-02-262-2/+4
* | | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2618-211/+262
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-259-72/+123
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-259-72/+49
| | |\ \ \ \
| | | * | | | Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-256-44/+35
| | | * | | | Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-252-28/+2
| | | | |/ / | | | |/| |
| | * | | | Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-252-1/+87
| | | |_|/ | | |/| |
* | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-2542-397/+435
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-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-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 remote branch 'origin/master'Olivier Goffart2010-02-242-1/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add -mediaservice argument to configure.Andrew den Exter2010-02-242-1/+13
| | |/ / | |/| |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-244-0/+522
|\ \ \ \ | |/ / /
| * | | 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
| | |/ /
* | | | Separate Phonon and gstreamer defines in qtconfigRhys Weatherley2010-02-232-2/+9
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | improve 64 bit support on windowsThierry Bastian2010-02-232-2/+2
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-231-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix compilationOlivier Goffart2010-02-221-1/+1
* | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-231-2/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | 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