summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed OpenGL graphicssystem issues for OpenGL ES 2.0 platforms.Samuel Rødal2009-12-043-14/+36
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-042-2/+3
|\
| * Fix toolbar animation when restoring from expanded stateThierry Bastian2009-12-042-2/+3
* | Made qobject.h "syncqt compliant".Jan-Arve Sæther2009-12-041-3/+3
|/
* Merge branch 'win32-icc' into 4.6Jan-Arve Sæther2009-12-042-12/+4
|\
| * Make sure that QtGui links with QtCore for the win32-icc mkspec.Jan-Arve Sæther2009-12-041-0/+4
| * Revert "Compile fix for win32-icc."Jan-Arve Sæther2009-11-301-12/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-049-10/+24
|\ \
| * | Fixes clipping bug in the embedded dialogs demo.Yoann Lopes2009-12-041-1/+0
| * | Fix crash when QGraphicsItem destructor deletes other QGraphicsItemOlivier Goffart2009-12-041-2/+2
| * | 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-031-2/+2
* | | Merge branch 'fleury-ooo-sequential' into 4.6Jan-Arve Sæther2009-12-044-206/+438
|\ \ \ | |/ / |/| |
| * | Made sure that we didn't reference dangling parallel anchors.Jan-Arve Sæther2009-12-041-2/+2
| * | Rename the global limit to g_offset.Jan-Arve Sæther2009-12-031-13/+13
| * | Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbo...Jan-Arve Sæther2009-12-014-206/+438
| |\ \
| | * | QGAL: Remove deprecated assert clausesEduardo M. Fleury2009-11-271-16/+0
| | * | QGAL: Refactor solvePreferred to support min/maxPrefSizeEduardo M. Fleury2009-11-271-24/+69
| | * | QGAL: Add AnchorData::minPrefSize and maxPrefSizeEduardo M. Fleury2009-11-273-46/+149
| | * | QGAL: parallel anchors sometimes have to fix constraintsCaio Marcelo de Oliveira Filho2009-11-271-16/+35
| | * | QGAL: move second child direction check to a functionCaio Marcelo de Oliveira Filho2009-11-272-12/+24
| | * | QGAL: Use single arrow in "dumpGraph"Eduardo M. Fleury2009-11-271-1/+1
| | * | QGAL: Enable out-of-order sequential simplificationEduardo M. Fleury2009-11-271-46/+23
| | * | QGAL: Support for out-of-order sequential anchorsEduardo M. Fleury2009-11-271-6/+34
| | * | QGAL: Do not revert negative anchorsJesus Sanchez-Palencia2009-11-272-23/+4
| | * | QGAL: Limit absolute size of anchors and add offset to calculationEduardo M. Fleury2009-11-272-12/+57
| | * | QGAL: Rename internalSizeHints to applySizePolicyEduardo M. Fleury2009-11-271-10/+15
| | * | QGAL: Fix memory management issues (leak + invalid read)Eduardo M. Fleury2009-11-272-6/+27
| | * | QGAL: Prevent internal anchors from being exposed by QGAL::anchor()Eduardo M. Fleury2009-11-271-2/+14
| | * | QGAL: default spacing can be unset using a negative valueEduardo M. Fleury2009-11-271-21/+2
* | | | 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-033-5/+58
|\ \ \ \
| * | | | qreal-izationAleksandar Sasha Babic2009-12-021-0/+57
| * | | | Fixed softkey merging/traversing over window boundaries.Janne Anttila2009-12-021-1/+1
| * | | | Fixed crash on Symbian when using QProgressDialog::setCancelButton(0).Janne Anttila2009-12-021-4/+0
* | | | | Fixes transformation problems with QGraphicsProxyWidget.Yoann Lopes2009-12-022-3/+2
* | | | | Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0238-156/+438
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-021-2/+8
| |\ \ \ \
| | * | | | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| * | | | | 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-011-2/+4
| * | | | | 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
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0111-25/+188
| |\ \ \ \ \
| | * | | | | Fix QFontCombobox autotest on X11Olivier Goffart2009-12-011-3/+2
| | * | | | | 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-019-20/+180
| | |\ \ \ \
| | | * \ \ \ Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-309-20/+180
| | | |\ \ \ \