summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | * | | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-132-5/+53
| | | | | | | | | * | | | | | | 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
| | | | | | | | | | |/ / / / / / /
| | | | | | | | | | * | | | | | | 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
| | | | | | | | | | * | | | | | | | 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
| | | | | | | | | | | | * | | | | | | | 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
| | | | | | | | | | | * | | | | | | | | | | Doc: Made documentation for Qt::TextLongestVariant public.David Boddie2010-10-041-7/+9
| | | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | | | * | | | | | | | | | 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
| | | | | | | | | | | * | | | | | | | | | 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-30285-6654/+16375
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | Doc: Fixed non-well-formed table output.David Boddie2010-09-241-1/+1
| | | | | | | | | | | * | | | | | | | | | | Doc: Fixed coding style breakage in qdoc source code.David Boddie2010-09-231-65/+64
| | | | | | | | | | | * | | | | | | | | | | Doc: Fixed a memory leak in the undo example.David Boddie2010-09-221-1/+1
| | | | | | | | | | | * | | | | | | | | | | Doc: Fixed typos.David Boddie2010-09-221-2/+2
| | | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-20379-4325/+3599
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | Doc: Fixed qdoc warnings for Phonon documentation.David Boddie2010-09-201-0/+77
| | | | | | | | | | | * | | | | | | | | | | | Doc: More work on QML reference documentation.David Boddie2010-09-174-30/+159
| | | | | | | | | | * | | | | | | | | | | | | Corrected doc about ASCII string.Jerome Pasion2010-10-041-1/+1
| | | | | | | | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-041164-2053/+9426
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ / / / / / / / | | | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-013-4/+14
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-0173-229/+171063
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-3052-4735/+946
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-2712-52/+140
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-131-17/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete tweak in QFontEngineS60::alphaMapForGlyphAlessandro Portale2010-10-121-17/+5
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-129-31/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Optimize QFontEngineS60::recalcAdvances()Alessandro Portale2010-10-121-3/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | Delete qtdemoapps.iby.Jason Barron2010-10-122-16/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | Added bearer plugin deployment to qt.ibyMiikka Heikkinen2010-10-121-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | Implement QFontEngineS60::emSquareSize()Alessandro Portale2010-10-122-0/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary calls to GetHorizBounds() + boundingBox()Alessandro Portale2010-10-122-10/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix memory leak in QFontEngineS60::addGlyphsToPath()Alessandro Portale2010-10-121-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix for CFbsBitmap to QPixmap conversion.Jani Hautakangas2010-10-123-2/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-124-16/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-122-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-123-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /