summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into m...Jan-Arve Sæther2009-11-062-0/+7
|\
| * Make sizePolicy a property of QGraphicsWidget tooArtur Duque de Souza2009-11-062-0/+7
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-06214-1659/+4643
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0611-4/+59
| |\ \
| | * \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-0611-4/+59
| | |\ \
| | | * | Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | * | Fix QT_NO_WHEELEVENTJørgen Lind2009-11-061-0/+2
| | | * | Fix QT_NO_WHATSTHISJørgen Lind2009-11-061-0/+2
| | | * | Fix QT_NO_MENUBARJørgen Lind2009-11-061-0/+2
| | | * | Fix QT_NO_SHORTCUTJørgen Lind2009-11-062-2/+4
| | | * | Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | | * | Fix QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-065-2/+33
| | | * | Fix QT_NO_TABLETEVENTJørgen Lind2009-11-061-0/+6
| | | * | Fix QT_NO_STATUSTIPJørgen Lind2009-11-061-0/+2
| | | * | Fix QT_NO_TOOLBARJørgen Lind2009-11-061-0/+2
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-063-33/+68
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Doc: Fixed a URL to ensure that it can be used in well-formed XML.David Boddie2009-11-061-1/+1
| | * | | Doc: Moved external references to a separate collection.David Boddie2009-11-062-32/+67
| | * | | Doc: Trivial fix.David Boddie2009-11-051-1/+1
| * | | | Merge branch '4.6-s60' into 4.6axis2009-11-0656-384/+1599
| |\ \ \ \
| | * | | | Initial LFLAGS support for qmake on Symbian OSIain2009-11-052-12/+53
| | * | | | QS60Style: Harmonize theme graphic with LineEdit and QTextEditSami Merilä2009-11-053-16/+1
| | * | | | QProgressBar is drawn stretched in QS60StyleSami Merilä2009-11-051-0/+5
| | * | | | QS60Style: Checked menu check indicators are not shownSami Merilä2009-11-051-5/+6
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0592-353/+1193
| | |\ \ \ \
| | * | | | | Fixed symbian-abld build problems with xmlpatternsxqtsMiikka Heikkinen2009-11-052-3/+1
| | * | | | | tst_qwidget widgetAt now does not leave widget lowered if test failsGareth Stockwell2009-11-041-2/+3
| | * | | | | Fix for link error when building QtSvgGareth Stockwell2009-11-042-1/+6
| | * | | | | QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-044-111/+149
| | |\ \ \ \ \
| | | * | | | | Unexported a class that doesn't need to be exported.axis2009-11-043-108/+108
| | | * | | | | Fixed input panel detection on post-5.0 S60 SDKs.axis2009-11-042-3/+41
| | * | | | | | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
| | |/ / / / /
| | * | | | | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04747-8997/+20543
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-04704-8768/+19538
| | | |\ \ \ \ \
| | | * | | | | | Fixed modal dialog fading support in Symbian.Janne Anttila2009-11-043-4/+25
| | | * | | | | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-049-3/+34
| | | * | | | | | def files updateShane Kearns2009-11-038-147/+817
| | | * | | | | | Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | * | | | | | | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-049-7/+77
| | * | | | | | | Call PositionChanged from QSymbianControl::SizeChangedGareth Stockwell2009-11-041-0/+5
| | * | | | | | | Removed some logging from MMF Phonon backendGareth Stockwell2009-11-041-2/+2
| | * | | | | | | Fixed crash opening audio clip when video clip currently openGareth Stockwell2009-11-031-0/+3
| | * | | | | | | Revert "Fixed a crash in the QApplication autotest."Gareth Stockwell2009-11-031-2/+1
| | * | | | | | | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-03527-34611/+36839
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix for defect introduced by dd48c27fGareth Stockwell2009-11-031-1/+4
| | * | | | | | | | Fixed volume calculation in Phonon MMF backendGareth Stockwell2009-11-031-1/+2
| | * | | | | | | | Fixed state bug in Phonon MMF backendGareth Stockwell2009-11-031-3/+3
| | * | | | | | | | Fix for unresponsive sliders after orientation switch or full-screenGareth Stockwell2009-11-031-0/+3
| | * | | | | | | | Fix build caused by merge error.Frans Englich2009-10-231-1/+0