summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-0423-30/+302
|\
| * Rebind window surface fbo after native GL renderingRhys Weatherley2009-12-044-2/+14
| * Better check for EGL extension stringsRhys Weatherley2009-12-041-1/+4
| * Some doc fixesJan-Arve Sæther2009-12-031-2/+2
| * Fixes broken selection with Shift and extended selectionOlivier Goffart2009-12-032-2/+44
| * Add extra auto-test for topLevel list corruption.Alexis Menard2009-12-031-0/+36
| * QCompleter wouldn't emit highlighted() and activated() signalsGabriel de Dietrich2009-12-031-3/+3
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-035-7/+122
| |\
| | * qreal-izationAleksandar Sasha Babic2009-12-021-0/+57
| | * Fixed softkey merging/traversing over window boundaries.Janne Anttila2009-12-022-1/+63
| | * Fixed crash on Symbian when using QProgressDialog::setCancelButton(0).Janne Anttila2009-12-021-4/+0
| | * Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| * | Stabilize tests on X11Olivier Goffart2009-12-024-5/+14
| * | Fix tst_QSystemLock::processesOlivier Goffart2009-12-021-4/+4
| * | Fixes transformation problems with QGraphicsProxyWidget.Yoann Lopes2009-12-023-4/+59
* | | Fixed compile for S60.Rohan McGovern2009-12-041-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0314-54/+106
|\ \ \
| * | | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-034-4/+4
| * | | Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-03126-602/+1680
| |\ \ \
| * | | | really fix mingw+msysOswald Buddenhagen2009-12-022-27/+13
| * | | | less bizarre code; fix minor mistakesOswald Buddenhagen2009-12-021-25/+25
| * | | | compile fix for Qt in namespacehjk2009-12-011-0/+4
| * | | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| * | | | fix for mingw+msysOswald Buddenhagen2009-11-301-5/+9
| * | | | Fix a documentation typo.Christian Kamm2009-11-301-1/+1
| * | | | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
* | | | | Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-022-31/+68
| |/ / / |/| | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-02105-573/+1492
|\ \ \ \
| * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0271-455/+1107
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0255-434/+927
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-023-4/+10
| | | |\ \
| | | | * | qreal-izationAleksandar Sasha Babic2009-12-021-1/+1
| | | | * | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| | | | * | Minor doc update for known-issues wiki link.Janne Anttila2009-12-011-1/+1
| | | * | | Reduce double-copying of textures when flipping upside downRhys Weatherley2009-12-021-7/+15
| | | * | | Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-012-2/+18
| | | * | | QWindowStyle: make sure there is no duplicate in the list of scrollbar.Olivier Goffart2009-12-011-4/+6
| | | * | | Fixed a potential crash in QDockWidgetThierry Bastian2009-12-011-2/+5
| | | * | | QVariant documentation: there is no function QVariant::isEmpty()Olivier Goffart2009-12-011-1/+0
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0116-289/+546
| | | |\ \ \
| | | | * | | Extended tst_QListView::indexAt to test viewport bounds.Gabriel de Dietrich2009-12-011-1/+9
| | | | * | | Fix QFontCombobox autotest on X11Olivier Goffart2009-12-012-5/+6
| | | | * | | In QListViews, items were being hovered even when mouse was on the scrollbarsGabriel de Dietrich2009-12-011-2/+6
| | | | |/ /
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-0112-281/+525
| | | | |\ \
| | | | | * \ Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-3012-281/+525
| | | | | |\ \
| | | | | | * | Clip video rect to physical screen dimensionsGareth Stockwell2009-11-261-1/+12
| | | | | | * | Tidied up logic of retrieving video window in Phonon MMF backendGareth Stockwell2009-11-261-2/+1
| | | | | | * | Suspend DSA while drawing is in progressGareth Stockwell2009-11-264-1/+85
| | | | | | * | Symbian control invokes slots before and after native draw opsGareth Stockwell2009-11-263-0/+29