Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 1 | -5/+5 |
| | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. | ||||
* | Doc: Removed a superfluous comment. | David Boddie | 2010-10-04 | 1 | -1/+0 |
| | | | | | Related to the rejected, but valid merge request: http://qt.gitorious.org/qt/qt/merge_requests/809 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-30 | 14 | -89/+68 |
|\ | |||||
| * | Merge branch '4.7' into newSearch | Morten Engvoldsen | 2010-09-28 | 2 | -47/+19 |
| |\ | |||||
| | * | Doc: fixing bugs in slim-fit style | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| | | | |||||
| | * | Added a condition to skip obsolete functions during the threadness check. | Jerome Pasion | 2010-09-24 | 1 | -16/+19 |
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786 | ||||
| * | | Doc: Implementing new search display | Morten Engvoldsen | 2010-09-24 | 1 | -1/+8 |
| |/ | |||||
| * | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -2/+2 |
| | | |||||
| * | Bump version to 4.7.1. | Jason McDonald | 2010-09-21 | 12 | -40/+40 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Doc: Fixed non-well-formed table output. | David Boddie | 2010-09-24 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Doc: Fixed coding style breakage in qdoc source code. | David Boddie | 2010-09-23 | 1 | -65/+64 |
|/ | | | | Reviewed-by: Trust Me | ||||
* | Doc: removing linebreak | Morten Engvoldsen | 2010-09-16 | 1 | -1/+0 |
| | |||||
* | Doc: correcting html template | Morten Engvoldsen | 2010-09-16 | 1 | -12/+3 |
| | |||||
* | Merge branch '13092010doc' into doc-4.7 | Morten Engvoldsen | 2010-09-16 | 1 | -4/+4 |
|\ | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf | ||||
| * | Doc: Removing google analytics from offline docs | Morten Engvoldsen | 2010-09-16 | 2 | -15/+5 |
| | | |||||
| * | Doc: correcting html template - validating | Morten Engvoldsen | 2010-09-16 | 1 | -1/+1 |
| | | |||||
| * | Doc: correcting html template | Morten Engvoldsen | 2010-09-16 | 1 | -28/+22 |
| | | |||||
* | | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-15 | 1 | -28/+22 |
|/ | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. | ||||
* | git Merge branch '4.7-upstream' into 4.7-doc | Jesper Thomschutz | 2010-09-15 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp | ||||
| * | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. | ||||
* | | qdoc: Fixed an html formatting error in the QML property list. | Martin Smith | 2010-09-15 | 1 | -21/+1 |
| | | |||||
* | | Doc: Excluded the libconninet library from the documentation. | David Boddie | 2010-09-08 | 4 | -6/+10 |
| | | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me | ||||
* | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 12 | -100/+117 |
|\ \ | |/ | |||||
| * | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵ | Morten Engvoldsen | 2010-09-07 | 1 | -1/+1 |
| | | | | | | | | changing qml elements page | ||||
| * | Doc: updating the qdocconf files and the stylesheet | Morten Engvoldsen | 2010-09-07 | 12 | -99/+116 |
| | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly | ||||
| * | Doc: Fixing links on index page and corecting HTML in the template. | Morten Engvoldsen | 2010-09-03 | 1 | -1/+1 |
| | | |||||
* | | Doc: Added dual documentation license information to the HTML templates. | David Boddie | 2010-09-06 | 3 | -0/+27 |
|/ | | | | | | | This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me | ||||
* | QString usage cleanups | Oswald Buddenhagen | 2010-09-01 | 1 | -1/+1 |
| | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh) | ||||
* | make qdoc3 boot-strappable again | Harald Fernengel | 2010-08-30 | 1 | -0/+1 |
| | |||||
* | Doc: Whitespace fixes. | David Boddie | 2010-08-27 | 1 | -23/+23 |
| | |||||
* | qdoc: Fixed erroneous links to QML basic types. | Martin Smith | 2010-08-25 | 1 | -2/+9 |
| | | | | Task-nr: QTBUG-13096 | ||||
* | Doc: Updating menu links | Morten Engvoldsen | 2010-08-23 | 1 | -4/+7 |
| | |||||
* | Doc: changing template menus to better reflect links from the index page. | Morten Engvoldsen | 2010-08-22 | 1 | -3/+5 |
| | |||||
* | Doc: Changes to the index page and second level pages linking to the index page. | Morten Engvoldsen | 2010-08-20 | 1 | -1/+1 |
| | |||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-08-20 | 1 | -5/+4 |
|\ | |||||
| * | qdoc: Changed id attribute to be a UUID. | Martin Smith | 2010-08-20 | 1 | -5/+4 |
| | | | | | | | | Task-nr: QTBUG-11113 | ||||
* | | Doc: fixing creator bugs, removing menus and textbox in the header | Morten Engvoldsen | 2010-08-20 | 1 | -6/+7 |
|/ | |||||
* | qdoc: Added more elements to qt.pageindex | Martin Smith | 2010-08-19 | 1 | -0/+29 |
| | | | | Task-nr: QTBUG-11113 | ||||
* | qdoc3: Added more pagewords & elements to the search index. | Martin Smith | 2010-08-19 | 1 | -3/+3 |
| | | | | Task-nr: QTBUG-11113 | ||||
* | qdoc3: Added more pagewords & elements to the search index. | Martin Smith | 2010-08-19 | 1 | -0/+6 |
| | | | | Task-nr: QTBUG-11113 | ||||
* | qdoc: Reorganized the QML elements table to be a dictionary... | Martin Smith | 2010-08-18 | 2 | -35/+95 |
| | | | | ...and a set of functional group pages. | ||||
* | qdoc: Reorganized the QML elements table to be a dictionary... | Martin Smith | 2010-08-16 | 3 | -0/+21 |
| | | | | ...and a set of functional group pages. | ||||
* | qdoc: Added the fix to change qml-qml-file.name to qml-file.name | Martin Smith | 2010-08-13 | 1 | -3/+3 |
| | |||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-08-12 | 3 | -41/+171 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-08-12 | 8 | -23/+111 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information. | ||||
| * \ | Merge commit 'remotes/origin/4.7' into qt47s2 | Thomas Zander | 2010-08-11 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp | ||||
| * \ \ | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7 | Olivier Goffart | 2010-08-09 | 15 | -146/+160 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h | ||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-05 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2010-08-05 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-04 | 24 | -236/+615 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc |