summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1762-699/+785
|\
| * Fix long text regression in listview that does not fits into the viewport.Olivier Goffart2009-11-171-2/+2
| * Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-173-6/+67
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-171-3/+0
| |\
| | * Fixing merger errors.Aleksandar Sasha Babic2009-11-161-3/+0
| * | Stabilize tests on X11Olivier Goffart2009-11-162-9/+16
| * | QFileDialog: user could not select a readonly file on vista and win7Thierry Bastian2009-11-161-1/+1
| * | Fixed querying of GLX extensions under X11.Trond Kjernåsen2009-11-161-13/+14
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-163-3/+6
| |\
| | * Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| * | QMenu: do not crash if action is destroyed in the triggered signal.Olivier Goffart2009-11-162-1/+15
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-1630-537/+534
| |\
| | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16639-26374/+31509
| | |\
| | * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-16419-4222/+10751
| | |\ \
| | * | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1318-340/+381
| | * | | Pause playback on small screens when popping up dialogs.Frans Englich2009-11-122-0/+21
| | * | | Mediaplayer now pauses playback before displaying error dialogGareth Stockwell2009-11-091-1/+1
| | * | | Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
| | * | | Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
| | * | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp...Gareth Stockwell2009-11-0911-167/+109
| | |\ \ \
| | | * | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-0911-167/+109
| | * | | | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
| | |/ / /
| | * | | Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
| * | | | Fix QT_NO_SHAREDMEMORY while not breaking the QNX buildJørgen Lind2009-11-161-0/+2
| * | | | Fix warningOlivier Goffart2009-11-161-1/+1
| * | | | Revert "Added a standard copyright header to files generated by rcc."Olivier Goffart2009-11-161-40/+0
| * | | | Fixed tab and tab contents frame overlapping when using style sheetsGabriel de Dietrich2009-11-161-2/+6
| * | | | Fixed extension checks and usage of the GL 2 engine on old X11 systems.Trond Kjernåsen2009-11-162-25/+36
| * | | | Properly initialize all vars.Thomas Zander2009-11-161-0/+1
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-1648-489/+545
| |\ \ \ \
| | * | | | Fix regression in emitting of QTextDocument::undoCommandAdded()Thomas Zander2009-11-162-1/+14
| | * | | | Fixed a crash in QPixmap::fromImage() when passing in a null image.Trond Kjernåsen2009-11-161-0/+5
| | | |_|/ | | |/| |
| | * | | Made widgets not clear their contents after losing edit focus.axis2009-11-162-0/+8
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-166-26/+15
| | |\ \ \
| | | * | | Define own palette for web-based widgets in QS60StyleSami Merilä2009-11-161-1/+9
| | | * | | Fix build error in QLibrary autotestShane Kearns2009-11-131-3/+3
| | | * | | Fix tst_collections compliation on symbian.Liang Qi2009-11-131-1/+1
| | | * | | Fix tst_qfile, disable largefile for symbian.Liang Qi2009-11-131-1/+1
| | | * | | Remove fake right mouse button events from long tapShane Kearns2009-11-132-20/+1
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-s60axis2009-11-13208-711/+2056
| | | |\ \ \
| | * | \ \ \ Merge branch 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1613-21/+113
| | |\ \ \ \ \
| | * | | | | | Fix context sharing in QGLPixelBuffer for EGLRhys Weatherley2009-11-151-26/+39
| * | | | | | | Fixed double precision problems in pdf printingGunnar Sletta2009-11-161-3/+3
* | | | | | | | i18n: Complete and spell-check German translations for 4.6.0Friedemann Kleint2009-11-175-276/+871
* | | | | | | | Reapply change log fix.Jedrzej Nowacki2009-11-171-2/+1
* | | | | | | | Small doc fix.axis2009-11-171-1/+1
* | | | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-17129-1769/+4919
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix inputMethods QWebPage autotest failure.Simon Hausmann2009-11-161-3/+3
| * | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-11-1656-1446/+3491
| * | | | | | | | tst_qtcpsocket: Check if proper connection error occursMarkus Goetz2009-11-161-0/+43