summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1466-335/+659
|\
| * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1457-275/+313
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1345-596/+923
| | |\
| | * | Fixed statement about const_iterator and some whitespace fixes.Jerome Pasion2010-10-132-3/+3
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-128-23/+29
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-112-1/+89
| | |\ \ \
| | * | | | Added the default format of QTime::toString().Jerome Pasion2010-10-111-0/+1
| | * | | | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
| | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-096-11/+36
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0819-82/+419
| | |\ \ \ \ \
| | * | | | | | Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | * | | | | | Fixed grammar mistake.Jerome Pasion2010-10-081-3/+3
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0748-161/+401
| | |\ \ \ \ \ \
| | * | | | | | | Doc: correcting bug - lenght() pointed to setLength() in "See also" section. ...Morten Engvoldsen2010-10-071-1/+1
| | * | | | | | | Doc: adding note to function QWSKeyboardHandler::processKeycode - that it wa...Morten Engvoldsen2010-10-071-0/+2
| | * | | | | | | 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-0624-322/+1013
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-061-3/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | * | | | | | | | | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | * | | | | | | | | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | |/ / / / / / / /
| | * | | | | | | | 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 1309...Jerome Pasion2010-09-16187-5283/+8956
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | * | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0516-306/+493
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0444-540/+412
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-0445-245/+251
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0481-621/+7678
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | | * | | | | | | | | | | | | Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-0439-195/+195
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0439-195/+195
| | | * | | | | | | | | | | | | | 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-042-7/+7
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-30170-5561/+2723
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | 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-2069-3762/+1893
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-30/+34
| | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Corrected doc about ASCII string.Jerome Pasion2010-10-041-1/+1
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1410-60/+346
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1310-60/+346
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-132-10/+11
| | | * | | | | | | | | | | | | | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-132-191/+122
| | | * | | | | | | | | | | | | | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-134-13/+318
| | | * | | | | | | | | | | | | | Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-131-4/+4
| | | * | | | | | | | | | | | | | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-132-5/+13
| | | * | | | | | | | | | | | | | Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | * | | | | | | | | | | | | | Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | * | | | | | | | | | | | | | In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | | * | | | | | | | | | | | | | QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-132-6/+13