Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-07 | 12 | -7/+51 |
|\ | |||||
| * | fix build for desktop | Konstantin Ritt | 2011-09-07 | 2 | -2/+13 |
| * | Fix the build with -qtnamespace configure options | suzuki toshiya | 2011-09-06 | 10 | -5/+38 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-09-07 | 26 | -77/+364 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'qt-air-review/master' | Sergio Ahumada | 2011-09-06 | 26 | -77/+364 |
| |\ \ |/ / / | |||||
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team | Qt Continuous Integration System | 2011-09-06 | 26 | -77/+364 |
| |\ \ | |||||
| | * | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35) | Ademar de Souza Reis Jr | 2011-09-06 | 26 | -77/+364 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-09-06 | 7 | -6/+65 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'qt-air-review/master' | Sergio Ahumada | 2011-09-06 | 7 | -6/+65 |
| |\ \ \ \ |/ / / / / | | _ / / | | / / | |||||
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team | Qt Continuous Integration System | 2011-09-05 | 315 | -4753/+20941 |
| |\ \ \ | | |/ / | |||||
| | * | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4 | Ademar de Souza Reis Jr | 2011-08-30 | 7 | -6/+65 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-05 | 2 | -2/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Removed the unnecessary dependency of the QtHelp module on the QtXml one | Constantin Makshin | 2011-09-05 | 2 | -2/+1 |
* | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-09-03 | 42 | -100/+415 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-09-03 | 13 | -63/+521 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | 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 | 38 | -112/+353 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-09-02 | 11 | -25/+521 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-09-01 | 610 | -6034/+13579 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update license headers | Gabriel de Dietrich | 2011-09-01 | 3 | -54/+57 |
| | * | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-31 | 120 | -1143/+2604 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 '4.8' into water-team-master | Frederik Gladhorn | 2011-08-31 | 10 | -24/+511 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Introduce menubar plugin system | Aurélien Gâteau | 2011-06-20 | 4 | -1/+42 |
| | | * | | | | | | | | Introduce QAbstractPlatformMenuBar | Aurélien Gâteau | 2011-06-20 | 6 | -11/+457 |
| | | * | | | | | | | | Hide Q<Platform>MenuAction | Aurelien Gateau | 2011-06-20 | 5 | -10/+10 |
| | | * | | | | | | | | Fix warning about initialization order | Aurélien Gâteau | 2011-06-20 | 1 | -3/+3 |
| | * | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-30 | 481 | -4866/+10454 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-08-29 | 2 | -4/+77 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-29 | 2 | -4/+77 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team | Qt Continuous Integration System | 2011-08-28 | 99 | -966/+1249 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-28 | 34 | -112/+477 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-27 | 64 | -853/+769 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-08-26 | 2 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ | 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.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-09-02 | 3 | -8/+12 |
| | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-09-02 | 1 | -4/+4 |
| | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | * | | | URLs used with scheme handler use appropriate encoding for scheme | mread | 2011-09-01 | 1 | -4/+4 |
| | | | | | | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-09-02 | 2 | -4/+8 |
| | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | * | | | | Revert readonly BorderImage::sourceSize change | Martin Jones | 2011-09-01 | 2 | -4/+8 |
| | | | | | | | | | | * | | | | | | Merge branch 4.8 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-09-01 | 28 | -88/+491 |
| | | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Designer: Fix static linking. | Jarek Kobus | 2011-08-31 | 1 | -9/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-08-31 | 27 | -81/+436 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote branch 'mainline/4.8' | Casper van Donderen | 2011-08-31 | 65 | -985/+1892 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt-doc-review/master' | Casper van Donderen | 2011-08-31 | 589 | -5824/+12076 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-08-30 | 757 | -9626/+31639 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |