summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1021-123/+165
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-0/+4
| |\
| | * Stop focus propagation of touch events when flag is set.Niklas Kurkisuo2011-02-091-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-093-4/+42
| |\ \
| | * | Fix build failureGareth Stockwell2011-02-092-6/+6
| | * | Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-093-4/+42
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-093-16/+15
| |\ \ \
| | * | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-4/+8
| | * | | Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-091-12/+7
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-083-31/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero.Thiago Macieira2011-02-081-1/+1
| | * | | Use an increasing size for the getpwuid_r buffer.Thiago Macieira2011-02-081-1/+12
| | * | | Make sure we use at least 1024 bytes when calling getpwuid_r.Thiago Macieira2011-02-081-1/+1
| | * | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Denis Dzyubenko2011-02-071-28/+0
| | * | | Don't crash when BMP color table is brokenHarald Fernengel2011-02-041-0/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-082-15/+36
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-062-15/+23
| | * | | Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-041-0/+13
| * | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-3/+3
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0413-23/+141
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-282-4/+18
| |\ \ \ \ \
| * | | | | | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2616-63/+647
| |\ \ \ \ \ \
| * | | | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-252-2/+2
| * | | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131147-1391/+1497
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Changed description to prevent confusion about managed widgets.David Boddie2011-01-101-3/+3
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1610-44/+59
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-162-14/+3
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-152-14/+3
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1532-214/+335
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-1/+3
| * | | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-147-43/+78
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-131-3/+1
| * | | | | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07117-1604/+2303
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | doc: Corrections to linking errors in the docs.Martin Smith2010-11-011-4/+4
| * | | | | | | | | | | | | doc: Moved some table headers ahead of the rows.Martin Smith2010-10-223-10/+10
| * | | | | | | | | | | | | doc: Moved some table headers before the rows.Martin Smith2010-10-201-9/+9
| * | | | | | | | | | | | | doc: Moved some table headers to be before the rows.Martin Smith2010-10-201-6/+6
| * | | | | | | | | | | | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-157-38/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-138-14/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0923-145/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into mimirMorten Engvoldsen2010-10-0634-496/+193
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0416-33/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-09-3015-185/+263
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | qdoc: Added missing </section>; added "span" infor temporarily.Martin Smith2010-09-301-20/+19
* | | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-108-17/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-092-17/+2
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-049-19/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-042-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9