Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-02-16 | 1 | -4/+27 |
|\ | |||||
| * | Doc: Updating platform support pages in the documentation | Morten Engvoldsen | 2011-02-15 | 1 | -4/+27 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-02-10 | 1 | -25/+25 |
|\ \ | |/ | |||||
| * | Doc: correcting typos | Morten Engvoldsen | 2011-02-08 | 1 | -25/+25 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-02-07 | 1 | -0/+287 |
|\ \ | |/ | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp | ||||
| * | Doc: Adding documentation on configure options for Qt configure | Morten Engvoldsen | 2011-02-07 | 1 | -0/+287 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-02-04 | 1 | -2/+4 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-01-26 | 1 | -1/+1 |
| |\ | |||||
| * | | Doc: Fixed QML syntax. | David Boddie | 2011-01-19 | 1 | -2/+4 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-26 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Fixing a merge conflict. Conflicts: doc/src/overviews.qdoc | ||||
| * | | Doc: fixing bugs and typos based on feedback | Morten Engvoldsen | 2011-01-25 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-17 | 9 | -9/+10 |
|\ \ | |/ | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp | ||||
| * | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 9 | -9/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h | ||||
| | * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 9 | -9/+9 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-12-21 | 1 | -0/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005. | ||||
| | | * | Make it clear which security updates are needed for Visual Studio 2005. | Jason McDonald | 2010-12-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As well as Service Pack 1, the compiler also needs four additional security updates in order to work correctly with Qt's pre-built binary package. Task-number: QTBUG-7633 Reviewed-by: Toby Tomkins | ||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | | | | | | | | Merging qt-doc-team into cloned repository | ||||
| * | | | Doc: Changed a page title. | David Boddie | 2010-12-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Task-number: QTBUG-16071 | ||||
* | | | Doc: Used div elements for floats, updated the style sheet. | David Boddie | 2010-12-14 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 3 | -5/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro | ||||
| * | | | Doc: Changed floating images to use the new float qdoc macros. | David Boddie | 2010-12-13 | 1 | -3/+1 |
| |/ / | |||||
| * | | Doc: Fixed incorrect case in a page file name. | David Boddie | 2010-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed a bug by changing the id name to lower case. | Jerome Pasion | 2010-12-06 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 3 | -122/+175 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h | ||||
| * | Doc: Correcting references to Qt Declarative module. | Morten Engvoldsen | 2010-11-15 | 1 | -1/+1 |
| | | |||||
| * | Added the location of Getting Started with QML code. | Jerome Pasion | 2010-11-09 | 1 | -1/+16 |
| | | | | | | | | | | Task-number: QTBUG-15042 Reviewed-by: David Boddie | ||||
| * | Doc: Added more hints for building Qt for Symbian on Linux. | David Boddie | 2010-11-04 | 1 | -113/+150 |
| | | | | | | | | Initial-review-and-suggestions-by: axis | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-20 | 1 | -1/+1 |
| |\ | |||||
| | * | Corrected spelling mistake and whitespace fixes. | Jerome Pasion | 2010-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Task-number: QTBUG-14501 | ||||
| * | | Doc: Fixed snippet reference for the Getting Started QML guide. | David Boddie | 2010-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Related to change 96226ad15202770f72e257d1a75654be9582326c. | ||||
| * | | Doc: Fixed warnings caused by an earlier change. Made docs consistent. | David Boddie | 2010-10-07 | 1 | -4/+4 |
| | | | | | | | | | | | | Related to change f447ae026637a75d565e9347eb19f33d09557039. | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-07 | 1 | -8/+8 |
| |\ \ | | |/ | |||||
| * | | Doc: Fixed links to the online BSD license information. | David Boddie | 2010-10-07 | 1 | -1/+2 |
| | | | |||||
* | | | qdoc: Fixed some DITA XML validation errors. | Martin Smith | 2010-10-28 | 1 | -5/+6 |
| |/ |/| | | | | | Fixed some \table problems as well. | ||||
* | | Doc: correcting grammar on the installation pages | Morten Engvoldsen | 2010-10-07 | 1 | -8/+8 |
|/ | |||||
* | Added a project file for the Getting Started with QML and changed the | Jerome Pasion | 2010-10-06 | 1 | -2/+2 |
| | | | | old file name references. | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-10-06 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Morten Engvoldsen | 2010-10-06 | 1 | -4/+4 |
| |\ | |||||
| * | | Doc: Fixing bug in QML tutorial | Morten Engvoldsen | 2010-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | The code snippet for the simple button was not correctly linked. | ||||
* | | | Added installation section and fixed some whitespace. | Jerome Pasion | 2010-10-06 | 1 | -36/+46 |
| |/ |/| | | | | | Reviewed-by: David Boddie | ||||
* | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-05 | 1 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | Doc: typographical and spelling errors. | Yann Bodson | 2010-10-01 | 1 | -4/+4 |
| | | |||||
* | | Added the QtWebKit bridge Image Analyzer example. | Jerome Pasion | 2010-10-04 | 1 | -2/+5 |
| | | | | | | | | | | | | | | Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-04 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 1 | -2/+2 |
| | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones | ||||
* | | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 9 | -45/+45 |
|/ | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. | ||||
* | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -25/+25 |
| | |||||
* | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 1 | -48/+6 |
|\ | |||||
| * | Doc: More work on the QML documentation. | David Boddie | 2010-09-14 | 1 | -1/+1 |
| | |