summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-08631-3158/+4145
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns ...
| * Added missing native separator transforms.Bruno Abinader2010-10-082-3/+14
| | | | | | | | | | | | | | | | This patch fixes the deployment of files when using Qt For Symbian SDK on Linux. Merge-request: 839 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-08629-3155/+4131
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits) Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns Doc: Fixing bug in QML tutorial ...
| | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-0720-72/+96
| | |\
| | | * Doc: tuning search reasult boxMorten Engvoldsen2010-10-071-0/+1
| | | |
| | | * qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | | |
| | | * Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0Morten Engvoldsen2010-10-071-2/+2
| | | |
| | | * Doc: correcting bug - lenght() pointed to setLength() in "See also" section. ↵Morten Engvoldsen2010-10-071-1/+1
| | | | | | | | | | | | | | | | Correct link is resize()
| | | * Doc: correct spellingMorten Engvoldsen2010-10-071-1/+1
| | | |
| | | * Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | | |
| | | * Doc: correcting grammar on the installation pagesMorten Engvoldsen2010-10-071-8/+8
| | | |
| | | * Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| | | |
| | | * Doc: adding note to function QWSKeyboardHandler::processKeycode - that it ↵Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | | | | | | | | | was added in Qt 4.6
| | | * Doc: correcting typoMorten Engvoldsen2010-10-071-1/+1
| | | |
| | | * Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | | |
| | | * Doc: Fixing typoMorten Engvoldsen2010-10-071-1/+1
| | | |
| | | * Doc: Fixing snippet bug. Path pointing to the wrong snippetMorten Engvoldsen2010-10-071-1/+1
| | | |
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0628-329/+1036
| | | |\
| | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-064-5/+11
| | | |\ \
| | | | * | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-063-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | old file name references.
| | | | * | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection is made. Task-number: QTBUG-14223 Reviewed-by: David Boddie
| | | * | | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13632 Reviewed-by: David Boddie
| | | * | | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14213 Reviewed-by: David Boddie
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-062-2/+2
| | | |\ \
| | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-061845-6418/+14930
| | | | |\ \
| | | | * | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
| | | | | | |
| | | * | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into ↵Jerome Pasion2010-09-16387-6615/+15965
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 13092010doc
| | | | | * | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources.
| | | | | * | | | Merge branch '4.7' into 13092010docMorten Engvoldsen2010-09-16386-6495/+15960
| | | | | |\ \ \ \
| | | | * | | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Bug:QTBUG-11324
| | | | * | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-132-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0787-455/+1857
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-06618-3083/+4035
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0648-353/+789
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0548-353/+789
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippet for the simple button was not correctly linked.
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0455-929/+680
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0419-2/+711
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.7Jerome Pasion2010-10-04599-3079/+3322
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041237-2202/+180355
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don\t use \i for italics. Use \e. Task: QTBUG-14133
| | | | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-10-041638-13422/+203674
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Git says this file was changed, but it wasn't changed.Martin Smith2010-09-151-9/+9
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-04586-2930/+2930
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-04586-2930/+2930
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
| | | | * | | | | | | | | | | Doc: Made documentation for Qt::TextLongestVariant public.David Boddie2010-10-041-7/+9
| | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by David Faure on #qt-labs.
| | | | * | | | | | | | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-049-18/+66
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to the rejected, but valid merge request: http://qt.gitorious.org/qt/qt/merge_requests/809