summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-011188-20202/+21126
|\
| * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-2013-221/+221
| |\
| | * Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-183-51/+51
| | * Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-6/+6
| | |\
| | * \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-167-1/+910
| | |\ \
| | * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131180-20042/+20042
| * | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-171171-20027/+20056
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-171177-19993/+19993
| | |\ \ \
| | | * | | Update licenseheader text in source filesJyri Tahtela2011-05-131177-19993/+19993
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-139-155/+184
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | * | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | | * | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | | * | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | | * | | doc: Fixed a QML snippet referenceMartin Smith2011-05-091-0/+1
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-161-6/+6
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-136-1/+899
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-05-126-1/+899
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | qmlplugindump: Use command line options with a single dash.Christian Kamm2011-05-121-7/+12
| | | * | | | qmlplugindump: Allow dumping by path without URI.Christian Kamm2011-05-121-11/+29
| | | * | | | Move qmldump from Qt Creator to Qt.Christian Kamm2011-05-126-1/+876
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-131-0/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1016-213/+312
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-042-4/+1
* | | | | | | use a printErr() function instead of std::cerr like in lupdateOswald Buddenhagen2011-06-011-8/+12
| |_|_|/ / / |/| | | | |
* | | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-161-6/+6
| |_|/ / / |/| | | |
* | | | | X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-05-131-0/+11
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-051-1/+1
|\ \ \ \
| * | | | skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-021-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-047-129/+144
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | QmlViewer: Translate UIKai Koehne2011-05-027-126/+142
| * | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-1492-7024/+24514
| |\ \ \ \
| * \ \ \ \ Merge ../qt-qml-stagingYann Bodson2011-03-296-88/+95
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-2341-2908/+1826
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-1637-38/+59
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-018-18/+42
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-17138-14484/+7920
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make -no-opengl exist on other platformsAlan Alpert2011-02-041-3/+2
* | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-039-199/+297
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-039-199/+297
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | / / | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-029-199/+297
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | * | | | | | | | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | * | | | | | | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | * | | | | | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | * | | | | | | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23