Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-14 | 5 | -125/+74 |
|\ | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18733 | ||||
| * | qdoc: Completed task QTBUG-18733 | Martin Smith | 2011-04-14 | 5 | -125/+74 |
| | | |||||
* | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-13 | 2 | -1/+27 |
|\ \ | |/ | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Last commit before merge into master. | ||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-04-13 | 3 | -2/+10 |
| |\ | |||||
| * | | qdoc: Last commit before merge into master. | Martin Smith | 2011-04-13 | 2 | -1/+27 |
| | | | | | | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard. | ||||
* | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-11 | 3 | -2/+10 |
|\ \ \ | | |/ | |/| | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed reference to a name in a table. Ensured that incomplete downloads are removed. | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-11 | 1 | -21/+7 |
| |\ \ | | |/ | |||||
| * | | Doc: Fixed reference to a name in a table. | David Boddie | 2011-04-11 | 1 | -1/+1 |
| | | | | | | | | | | | | Task-number: QTBUG-18679 | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-07 | 3 | -50/+184 |
| |\ \ | |||||
| * | | | Ensured that incomplete downloads are removed. | David Boddie | 2011-04-07 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-18509 | ||||
* | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-08 | 1 | -21/+7 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed license comment. | ||||
| * | | | qdoc: Fixed license comment. | Martin Smith | 2011-04-08 | 1 | -21/+7 |
| | |/ | |/| | |||||
* | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-07 | 5 | -75/+210 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Added missing copyright notice qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. Aim to fix Windows builds. | ||||
| * | | qdoc: Added missing copyright notice | Martin Smith | 2011-04-07 | 1 | -0/+41 |
| | | | |||||
| * | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -5/+6 |
| | | | |||||
| * | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -10/+13 |
| | | | |||||
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-04-07 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-06 | 4 | -24/+25 |
| | |\ | |||||
| | * | | Aim to fix Windows builds. | David Boddie | 2011-04-05 | 1 | -1/+3 |
| | | | | |||||
| * | | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 2 | -39/+128 |
| | |/ | |/| | |||||
| * | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-06 | 3 | -24/+23 |
| | | | |||||
* | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-06 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed QTBUG-18591 | ||||
| * | | qdoc: Fixed QTBUG-18591 | Martin Smith | 2011-04-06 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-05 | 38 | -602/+951 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. Doc: Minor fix to title. Doc: Fixed markup. Doc: Added a missing command. Doc: Removed duplicate documentation. Removed some links and prettified others. Doc: Squashed commit of Roland Wolf's threading tutorial. | ||||
| * | 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 | 80 | -408/+1129 |
| |\ | |||||
| * | | Removed invalid public slots section. | David Boddie | 2011-04-05 | 1 | -2/+0 |
| | | | | | | | | | | | | Task-number: QTBUG-9316 | ||||
| * | | Minor feature fix led to refactoring for i18n's sake. | David Boddie | 2011-04-05 | 8 | -509/+859 |
| | | | | | | | | | | | | Task-number: QTBUG-18397 | ||||
| * | | Fixed string-int concatenation issue. | David Boddie | 2011-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Task-number: QTBUG-18086 | ||||
| * | | Merge branch '4.7' of ../qt-doc-team-threading into 4.7 | David Boddie | 2011-04-05 | 2 | -6/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/tutorials.qdoc | ||||
| | * \ | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 957 | -2463/+59705 |
| | |\ \ | |||||
| | * | | | Doc: Minor fix to title. | David Boddie | 2011-03-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7 | David Boddie | 2011-03-18 | 10 | -196/+205 |
| | |\ \ \ | |||||
| | * | | | | Doc: Squashed commit of Roland Wolf's threading tutorial. | David Boddie | 2011-03-17 | 2 | -6/+6 |
| | | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 46 | -349/+1191 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Doc: Fixed markup. | David Boddie | 2011-03-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Doc: Added a missing command. | David Boddie | 2011-03-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Doc: Removed duplicate documentation. | David Boddie | 2011-03-25 | 1 | -13/+0 |
| | | | | | | |||||
| * | | | | | Removed some links and prettified others. | David Boddie | 2011-03-25 | 1 | -12/+26 |
| | | | | | | |||||
* | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-05 | 10 | -48/+153 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Allowed multiple values for certain metadata tags. | ||||
| * | | | | | qdoc: Allowed multiple values for certain metadata tags. | Martin Smith | 2011-04-05 | 10 | -48/+153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed. | ||||
* | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-01 | 4 | -33/+123 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: modified \include to take a 2nd arg, snippet id. | ||||
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-04-01 | 18 | -87/+106 |
| |\ \ \ \ \ | |||||
| * | | | | | | qdoc: modified \include to take a 2nd arg, snippet id. | Martin Smith | 2011-04-01 | 4 | -33/+123 |
| | | | | | | | |||||
* | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-04-01 | 4 | -6/+8 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Removed mobile demos from the Symbian build in demos.pro | ||||
| * | | | | | | Removed mobile demos from the Symbian build in demos.pro | Jerome Pasion | 2011-04-01 | 4 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen | ||||
* | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team | Qt Continuous Integration System | 2011-03-31 | 6 | -30/+41 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixed demo subdirs for mobile examples. QSoftkeyManager auto test update Corrected case mismatch. Fixed pro file syntax in demos/spectrum Fix for failing autotest QToolBar/Symbian Removed useless Exit button in Symbian^3 | ||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Jerome Pasion | 2011-03-31 | 5 | -24/+35 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2011-03-31 | 1 | -15/+19 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QSoftkeyManager auto test update | ||||
| | | * | | | | | | QSoftkeyManager auto test update | Titta Heikkala | 2011-03-30 | 1 | -15/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated correct values to simulateSymbianCommand function calls. It is defined in QSoftKeyManagerPrivateS60 that left and right softkeys are 0 and 2, now these values are used in test also. The signal spy actions have been updated to track the correct button in checkSoftkeyEnableStates-function. Task-number: QTBUG-18375 Reviewed-by: Sami Merila |