summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Add TIFFClose to QTIffHandler::option() to avoid memory leakTopi Reiniƶ2010-10-111-0/+1
* [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel ...Carlos Manuel Duclos Vergara2010-10-111-4/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0951-258/+271
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0951-258/+271
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0851-258/+271
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0851-258/+271
| | | |\
| | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-077-12/+19
| | | | |\
| | | | | * 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' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0756-427/+1286
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-0646-246/+252
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | 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-092-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-082-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-081-0/+4
| | * | | | | | | | | | | | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
* | | | | | | | | | | | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-083-2/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-087-58/+50
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-071-1/+2
| * | | | | | | | | | | Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0710-20/+363
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| * | | | | | | | | | | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1