Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-06-27 | 1 | -2/+4 |
|\ | |||||
| * | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 | Simo Fält | 2011-06-17 | 1 | -2/+4 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-22 | 1 | -23/+40 |
|\ \ | |||||
| * | | qmlplugindump: Add -v option. | Christian Kamm | 2011-06-21 | 1 | -23/+40 |
| * | | qmlplugindump: Fix emitted tooling version. | Christian Kamm | 2011-06-21 | 1 | -2/+2 |
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 25 | -2628/+4868 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-10 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | fix build on windows 7 | Oswald Buddenhagen | 2011-06-10 | 1 | -1/+0 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-09 | 1 | -6/+16 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | qmlplugindump: Bump QtQuick.tooling version to 1.1. | Christian Kamm | 2011-05-30 | 1 | -1/+1 |
| | * | | qmlplugindump: Dump revision property. | Christian Kamm | 2011-05-30 | 1 | -0/+9 |
| | * | | qmlplugindump: Fix --path usage with drive letters on Windows. | Christian Kamm | 2011-05-30 | 1 | -5/+6 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-06-09 | 1 | -2/+9 |
| |\ \ \ | |||||
| | * | | | Fix compilation of qtconfig without X11 | Olivier Goffart | 2011-06-08 | 1 | -2/+9 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-08 | 22 | -2610/+4817 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | "fix" license headers | Oswald Buddenhagen | 2011-06-02 | 9 | -126/+207 |
| | * | | | need no qlibraryinfo any more | Oswald Buddenhagen | 2011-06-01 | 2 | -21/+0 |
| | * | | | remove dead variables | Oswald Buddenhagen | 2011-06-01 | 1 | -17/+3 |
| | * | | | optimization: avoid creating unnecessary temporaries | Oswald Buddenhagen | 2011-06-01 | 1 | -35/+29 |
| | * | | | add hash-based indexing to Translator for fast find() | Oswald Buddenhagen | 2011-06-01 | 2 | -26/+92 |
| | * | | | remove Translator::translatedMessages() | Oswald Buddenhagen | 2011-06-01 | 3 | -13/+1 |
| | * | | | remove Translator::contains() | Oswald Buddenhagen | 2011-06-01 | 3 | -10/+1 |
| | * | | | optimization: make the Translator::find() api index-based | Oswald Buddenhagen | 2011-06-01 | 3 | -35/+38 |
| | * | | | fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks() | Oswald Buddenhagen | 2011-06-01 | 2 | -3/+3 |
| | * | | | nuke Translator::release(), make saveQM() non-static instead | Oswald Buddenhagen | 2011-06-01 | 5 | -14/+5 |
| | * | | | synchronize qmake project parser with qt creator | Oswald Buddenhagen | 2011-06-01 | 14 | -2580/+4708 |
| | |/ / | |||||
| * | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-06-06 | 1 | -1/+14 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Update Japanese translations. | Takumi ASAKI | 2011-06-06 | 1 | -1/+14 |
| * | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-06-01 | 1188 | -20202/+21126 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | use a printErr() function instead of std::cerr like in lupdate | Oswald Buddenhagen | 2011-06-01 | 1 | -8/+12 |
* | | | | qdoc: Fixed code to match comments in QML files. Fixed API types. | David Boddie | 2011-06-08 | 2 | -7/+6 |
* | | | | Added an additional check to workaround an issue on Windows. | David Boddie | 2011-06-01 | 1 | -1/+1 |
* | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-24 | 1184 | -20254/+20283 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-20 | 13 | -221/+221 |
| |\ \ \ | |||||
| | * | | | Re-apply licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-18 | 3 | -51/+51 |
| | * | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 1 | -6/+6 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-16 | 7 | -1/+910 |
| | |\ \ \ \ | |||||
| | * | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1180 | -20042/+20042 |
| * | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 1171 | -20027/+20056 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 1177 | -19993/+19993 |
| | |\ \ \ \ | |||||
| | | * | | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 1177 | -19993/+19993 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-05-13 | 9 | -155/+184 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | doc: Fixed QTBUG-19226 | Martin Smith | 2011-05-12 | 1 | -2/+6 |
| | | * | | | | doc: Fixed QTBUG-19223 | Martin Smith | 2011-05-12 | 1 | -1/+3 |
| | | * | | | | doc: Remved debug code for QTBUG-18791 | Martin Smith | 2011-05-12 | 1 | -26/+0 |
| | | * | | | | doc: Fixed QTBUG-18791 | Martin Smith | 2011-05-11 | 9 | -145/+193 |
| | | * | | | | doc: Fixed a QML snippet reference | Martin Smith | 2011-05-09 | 1 | -0/+1 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-16 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Revert all QScroller and QFlickGesture related code. | Robert Griebl | 2011-05-16 | 1 | -6/+6 |
* | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-16 | 10 | -6/+912 |
|\ \ \ \ \ \ | |/ / / / / |