Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-09-16 | 1 | -9/+9 |
|\ | |||||
| * | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-09-14 | 313 | -10174/+18486 |
| |\ | |||||
| * | | Migrate addMarkUp function to QChar. | Casper van Donderen | 2011-09-08 | 1 | -9/+9 |
| * | | Fix assert error on Windows with a negative char. | Casper van Donderen | 2011-09-02 | 1 | -4/+4 |
* | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-09-15 | 15 | -249/+490 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-09-10 | 1 | -2/+8 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-09-08 | 20 | -313/+499 |
| | |\ \ | |||||
| | * | | | Fixed compiling error in qvfb. | luohua | 2011-09-02 | 2 | -2/+9 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-08 | 2 | -12/+16 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-07 | 2 | -2/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-05 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-09-03 | 3 | -39/+7 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-09-03 | 9 | -202/+168 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Modified \since command behavior slightly to handle project and version. | David Boddie | 2011-09-02 | 9 | -202/+168 |
| | | * | | | | | | Merge remote-tracking branch 'origin/4.8' | Liang Qi | 2011-09-02 | 1 | -9/+2 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-09-02 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-31 | 13 | -93/+299 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Silently ignore a wrong parameter count instead of crashing | Peter Grasch | 2011-08-31 | 1 | -4/+5 |
| | | * | | | | | | | | | Introducing --address <bus> parameter to qdbus | Peter Grasch | 2011-08-31 | 1 | -1/+6 |
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-09-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Added an additional check to workaround an issue on Windows. | David Boddie | 2011-09-02 | 1 | -1/+1 |
| | | | |/ / / / / | | | |/| | | | | | |||||
| * | | | | | | | | Merge branch 4.8 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-09-01 | 11 | -47/+329 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-08-31 | 1 | -9/+2 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge remote branch 'mainline/4.8' | Casper van Donderen | 2011-08-31 | 4 | -61/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'qt-doc-review/master' | Casper van Donderen | 2011-08-31 | 12 | -188/+185 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.8' | Casper van Donderen | 2011-08-30 | 11 | -48/+303 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | qdoc3: Updates to qdoc to print error message in ALL CAPS | Martin Smith | 2011-08-29 | 1 | -2/+2 |
| | * | | | | | | | | | Merge remote branch 'qt-doc-team/4.8' | Casper van Donderen | 2011-08-29 | 10 | -44/+333 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | qdoc3: Updates for QTBUG-20776; include fileToOpen path. | Martin Smith | 2011-08-18 | 1 | -2/+6 |
| | | * | | | | | | | | qdoc3: Updates for QTBUG-20776; clear map between runs. | Martin Smith | 2011-08-18 | 1 | -1/+21 |
| | | * | | | | | | | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components) | Martin Smith | 2011-08-11 | 4 | -2/+40 |
| | | * | | | | | | | | qdoc3: Updates for QTBUG-20776 and QTBUG-20777 | Martin Smith | 2011-08-10 | 3 | -18/+86 |
| | | * | | | | | | | | qdoc: Check pointer for null before dereferencing. | Martin Smith | 2011-08-03 | 1 | -2/+3 |
| | | * | | | | | | | | qdoc3: Reverting part of the change for QTBUG-17072 | Martin Smith | 2011-08-02 | 1 | -4/+4 |
| | | * | | | | | | | | qdoc3: Write "Signal Handlers" instead of "Signals" as header | Martin Smith | 2011-08-02 | 3 | -12/+12 |
| | | * | | | | | | | | qdoc: Fixed to remove extranious markup tags. | Martin Smith | 2011-07-22 | 1 | -2/+3 |
| | | * | | | | | | | | qdoc: Added HTML.nobreadcrumbs as a config variable. | Martin Smith | 2011-07-21 | 2 | -1/+8 |
| | | * | | | | | | | | Phase 1 of QTBUG-20412, the XML manifest file | Martin Smith | 2011-07-15 | 10 | -23/+140 |
| | | * | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-06-17 | 2 | -7/+16 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-06-09 | 24 | -2621/+4852 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 36 | -115/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 10 | -208/+186 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added an additional check to workaround an issue on Windows. | David Boddie | 2011-08-30 | 1 | -1/+1 |
| | * | | | | | | | | | | | Modified \since command behavior slightly to handle project and version. | David Boddie | 2011-08-30 | 9 | -202/+174 |
| | * | | | | | | | | | | | qdoc: Fixed QTBUG-19338 | Martin Smith | 2011-08-30 | 2 | -5/+11 |
* | | | | | | | | | | | | | runonphone: Add a missing argument for QString::arg | Martin Storsjo | 2011-09-12 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | runonphone: Add a missing space between a message and the file name | Martin Storsjo | 2011-09-07 | 1 | -1/+1 |
* | | | | | | | | | | | | Perl check for windows configure. | Markku Heikkila | 2011-09-07 | 1 | -11/+15 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | fix build for desktop | Konstantin Ritt | 2011-09-07 | 2 | -2/+13 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Removed the unnecessary dependency of the QtHelp module on the QtXml one | Constantin Makshin | 2011-09-05 | 1 | -1/+0 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | |