summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-25544-2808/+3225
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix Flipable docsBea Lam2010-10-221-8/+9
| | | | | | | | Task-number: QTBUG-13789
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-182-2/+2
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-152-2/+2
| | |\
| | | * Fix autotest failure caused by commit 92365268Jason McDonald2010-10-152-2/+2
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-13543-2756/+3165
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. 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 ...
| * | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-181-1/+1
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-14501
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-154-9/+30
| |\ \ \
| | * | | Doc: Clearing details around default settings.Morten Engvoldsen2010-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-9856
| | * | | Doc: making links more visible when they are visited.Morten Engvoldsen2010-10-141-0/+9
| | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-10717
| | * | | Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18
| | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-10925
| | * | | Doc: Adding note to tier 2: The ppc architecture on Mac has been downgraded ↵Morten Engvoldsen2010-10-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from tier 1 to tier 2 for 4.7. Task-number: QTBUG-13803
| * | | | Changed Javascript guide link in Intro to the QML Language page.Jerome Pasion2010-10-152-3/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Replaced link to commercial Javascript book. Reviewed-by: Geir Vattekar
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-131-0/+2
| |\ \ \ | | |/ /
| * | | Doc: adjusting the search field widthMorten Engvoldsen2010-10-131-1/+1
| | | |
| * | | Doc - remove disclaimerLeena Miettinen2010-10-121-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14407 Reviewed-by: Friedemann Kleint Reviewed-by: Henry Haverinen
| * | | Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-082-10/+14
| | | | | | | | | | | | | | | | QtWebKit Image Analyzer example.
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-087-16/+18
| |\ \ \ | | | |/ | | |/|
| | * | Doc: tuning search reasult boxMorten Engvoldsen2010-10-071-0/+1
| | | |
| | * | Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0Morten Engvoldsen2010-10-071-2/+2
| | | |
| | * | Doc: correct spellingMorten Engvoldsen2010-10-071-1/+1
| | | |
| | * | Doc: correcting grammar on the installation pagesMorten Engvoldsen2010-10-071-8/+8
| | | |
| | * | Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| | | |
| | * | Doc: correcting typoMorten Engvoldsen2010-10-071-1/+1
| | | |
| | * | Doc: Fixing typoMorten Engvoldsen2010-10-071-1/+1
| | | |
| * | | Doc: Update to Phonon overviewGeir Vattekar2010-10-081-19/+0
| |/ /
| * | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-061-2/+2
| | | | | | | | | | | | old file name references.
| * | 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-06671-2898/+3342
| | |\ \
| | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0616-45/+35
| | | |\ \
| | | * | | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The code snippet for the simple button was not correctly linked.
| | * | | | 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 '4.7-upstream' into 4.7-docA-Team2010-10-0516-45/+35
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-041-2/+3
| |\ \ \ \
| * | | | | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-045-2/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.7David Boddie2010-10-04145-155/+230
| |\ \ \ \ \
| * | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-04533-2665/+2665
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
| * | | | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-047-11/+59
| | | | | | |
| * | | | | | Doc: Shorten lists of basic QML types.David Boddie2010-09-302-22/+11
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-3010-196/+472
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-20135-201/+668
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Fixed qdoc warnings for Phonon documentation.David Boddie2010-09-201-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This more or less contains the same documentation as upstream Phonon but can't be merged because we need to maintain our documentation in different files to make qdoc read it. :-( Reviewed-by: Trust Me
| * | | | | | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-191-0/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enable the unified toolbar with the raster configure: Don't use character class when looking for QMAKE_CONF_COMPILER Moving the resetInternalData slot to QAbstractProxyModel Provide the resetInternalData slot to cleanly reset data in proxy subclasses. Emit beginResetModel before updating the strings. Send the hoverLeave not properly sent on the widget inside QGPW.
| * | | | | | | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-191-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Reviewed-by: gabi Merge-request: 694
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| * | | | | | | | Update color type docs to mention transparencyBea Lam2010-10-131-0/+2
| | | | | | | | |
generated by cgit v0.12 at 2025-02-28 00:29:04 (GMT)