summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-072-6/+81
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-045-2/+59
| |\
| * | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
* | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03271-130/+19680
| |/ |/|
* | Added Qt Quick License information.Jerome Pasion2011-03-033-2/+52
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-0223-82/+461
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-0223-84/+465
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-015-10/+13
| | |\
| | | * Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | * Fixed pointer to the example image.Jerome Pasion2011-03-011-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-014-1599/+1744
| | | |\
| | | * | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | * | | Doc: Improved the color contrast of text in tables.David Boddie2011-03-011-2/+2
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-2/+2
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-0111-66/+437
| | * | | Doc: Converted the Internationalization with Qt document into a group.David Boddie2011-03-014-4/+11
| * | | | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| |/ / /
* | | | Doc: Fixed memory leak in undo framework exampleGeir Vattekar2011-03-022-0/+7
| |_|/ |/| |
* | | Doc: Work on QInputContext::reset() docsGeir Vattekar2011-03-011-3/+4
|/ /
* | Merge branch 'mimir' into 4.7Martin Smith2011-03-013-1596/+1740
|\ \ | |/ |/|
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-012-139/+157
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-15/+95
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-251-10/+29
| * qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-252-4/+123
| * qdoc: More updating command descriptions.Martin Smith2011-02-251-769/+695
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-169/+115
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-210/+186
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-133/+123
| * qdoc: More updating command descriptions.Martin Smith2011-02-241-113/+105
| * Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2011-02-2410872-34075/+68613
| |\
| * | qdoc: More updating command descriptions.Martin Smith2011-02-241-139/+117
* | | Doc: correcting error in tableMorten Engvoldsen2011-03-011-1/+0
* | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-2834-923/+1398
|\ \ \
| * | | qmake-manual.qdoc: Fixed qmake linksNikos Giotis2011-02-281-849/+946
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-264-13/+44
| |\ \ \
| | * | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| | * | | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| | * | | Don't crash when marking arguments object of native contextKent Hansen2011-02-253-2/+27
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-267-75/+287
| |\ \ \ \
| | * | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| | * | | | Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| | * | | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| | * | | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| | * | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-253-5/+125
| | * | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| | * | | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-253-7/+66
| |\ \ \ \ \