summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-221-23/+40
|\
| * qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| * qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1725-2628/+4868
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-101-1/+0
| |\ \
| | * | fix build on windows 7Oswald Buddenhagen2011-06-101-1/+0
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-091-6/+16
| |\ \ \ | | | |/ | | |/|
| | * | qmlplugindump: Bump QtQuick.tooling version to 1.1.Christian Kamm2011-05-301-1/+1
| | * | qmlplugindump: Dump revision property.Christian Kamm2011-05-301-0/+9
| | * | qmlplugindump: Fix --path usage with drive letters on Windows.Christian Kamm2011-05-301-5/+6
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-091-2/+9
| |\ \ \
| | * | | Fix compilation of qtconfig without X11Olivier Goffart2011-06-081-2/+9
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-0822-2610/+4817
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | "fix" license headersOswald Buddenhagen2011-06-029-126/+207
| | * | | need no qlibraryinfo any moreOswald Buddenhagen2011-06-012-21/+0
| | * | | remove dead variablesOswald Buddenhagen2011-06-011-17/+3
| | * | | optimization: avoid creating unnecessary temporariesOswald Buddenhagen2011-06-011-35/+29
| | * | | add hash-based indexing to Translator for fast find()Oswald Buddenhagen2011-06-012-26/+92
| | * | | remove Translator::translatedMessages()Oswald Buddenhagen2011-06-013-13/+1
| | * | | remove Translator::contains()Oswald Buddenhagen2011-06-013-10/+1
| | * | | optimization: make the Translator::find() api index-basedOswald Buddenhagen2011-06-013-35/+38
| | * | | fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()Oswald Buddenhagen2011-06-012-3/+3
| | * | | nuke Translator::release(), make saveQM() non-static insteadOswald Buddenhagen2011-06-015-14/+5
| | * | | synchronize qmake project parser with qt creatorOswald Buddenhagen2011-06-0114-2580/+4708
| | |/ /
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-061-1/+14
| |\ \ \ | | |/ / | |/| |
| | * | Update Japanese translations.Takumi ASAKI2011-06-061-1/+14
| * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-011188-20202/+21126
| |\ \ \ | | | |/ | | |/|
| * | | use a printErr() function instead of std::cerr like in lupdateOswald Buddenhagen2011-06-011-8/+12
* | | | qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
* | | | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-241184-20254/+20283
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-161-6/+6
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-1610-6/+912
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
generated by cgit v0.12 at 2024-12-03 03:15:08 (GMT)