Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 58 | -318/+13797 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-04-09 | 2 | -1/+4 |
| |\ | |||||
| | * | Designer: Allow promoted QWidget's to be buddies. | Friedemann Kleint | 2011-04-08 | 1 | -1/+3 |
| | * | Designer: Specify 'notr' attribute for buttongroup name. | Friedemann Kleint | 2011-04-08 | 1 | -0/+1 |
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-09 | 2 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-09 | 2 | -2/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-08 | 2 | -2/+2 |
| | | |\ \ | |||||
| | | | * | | make -markuntranslated work without -idbased | Oswald Buddenhagen | 2011-04-08 | 1 | -1/+1 |
| | | | * | | fix conditional on shell type | Oswald Buddenhagen | 2011-04-08 | 1 | -1/+1 |
| * | | | | | Merge remote branch 'qa-review/master' into qa-staging-master | Rohan McGovern | 2011-04-07 | 2 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge qt/qt.git master into qa-team-master | Rohan McGovern | 2011-03-24 | 201 | -17423/+9824 |
| | |\ \ \ \ | |||||
| | * | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1236 | -1246/+1246 |
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 53 | -313/+13789 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-07 | 1 | -0/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | QmlViewer: Enable remote qml debugging | Kai Koehne | 2011-04-06 | 1 | -0/+3 |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 34 | -145/+357 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | Fixed the declarative headers and includes within qdoc. | David Boddie | 2011-04-05 | 22 | -56/+56 |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 12 | -102/+346 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | qdoc: Allowed multiple values for certain metadata tags. | Martin Smith | 2011-04-05 | 9 | -44/+152 |
| | | | * | | | | | qdoc: modified \include to take a 2nd arg, snippet id. | Martin Smith | 2011-04-01 | 4 | -33/+123 |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 9 | -103/+155 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Removed some links and prettified others. | David Boddie | 2011-03-25 | 1 | -12/+26 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-01 | 37 | -243/+13504 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-30 | 2 | -34/+39 |
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-03-28 | 1 | -53/+38 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Jerome Pasion | 2011-03-28 | 2 | -34/+39 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-30 | 1 | -25/+71 |
| | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-28 | 1 | -53/+38 |
| | | |/ / / / / / / | |||||
| | | * | | | | | | | qdoc: Added a way to exclude directories from receiving default metadata | Martin Smith | 2011-03-28 | 1 | -0/+20 |
| | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-25 | 20 | -35/+12902 |
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Avoided the use of hard-coded file names. | David Boddie | 2011-03-24 | 1 | -34/+70 |
| | | | * | | | | | | Copied the declarative parser into qdoc3 to avoid dependency issues. | David Boddie | 2011-03-24 | 19 | -1/+12832 |
| | | * | | | | | | | qdoc: Added default values to config file for DITA | Martin Smith | 2011-03-25 | 5 | -16/+58 |
| | | |/ / / / / / | |||||
| | | * | | | | | | qdoc: Don't wrap <image> in <fig> if in an <xref> | Martin Smith | 2011-03-24 | 1 | -2/+4 |
| | | * | | | | | | qdoc: Added <copyright>, <copyryear>, and <copyrholder>. | Martin Smith | 2011-03-24 | 1 | -3/+19 |
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-24 | 25 | -86/+429 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'clone_4.7' into 4.7 | Jerome Pasion | 2011-03-23 | 6 | -6/+263 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Adopting changes from a merge with qt-doc-team repo, 4.7 branch | Jerome Pasion | 2011-03-22 | 3 | -3/+3 |
| | | | | * | | | | | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7 | Jerome Pasion | 2011-03-18 | 5 | -321/+382 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 5 | -6/+262 |
| | | | | * | | | | | | | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 1 | -0/+1 |
| | | * | | | | | | | | | qdoc: Completed metadata handling. | Martin Smith | 2011-03-24 | 8 | -126/+152 |
| | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | fix configure.exe option -opengl desktop | Mark Brand | 2011-03-31 | 1 | -1/+1 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 44 | -6884/+10895 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-04-04 | 2 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Designer [Qt Creator integration]: Fix integrated property editor. | Friedemann Kleint | 2011-04-04 | 2 | -1/+5 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 42 | -6883/+10890 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-03-27 | 42 | -6883/+10890 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 18 | -76/+159 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | qdoc: Avoid infinite loops in table of contents generation. | David Boddie | 2011-03-21 | 1 | -1/+4 |