summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make tst_headers pass with changed QtScript licenseSimon Hausmann2009-11-171-1/+1
* Fixed the QtScript license information in the source files to referSimon Hausmann2009-11-1766-1254/+66
* Replace LGPL license tags with LGPL-ONLYSimon Hausmann2009-11-1766-66/+66
* Compile in namespaceAaron Kennedy2009-11-171-0/+1
* Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1696-1051/+1623
|\
| * Make pbuffers example compile under OpenGL/ES 1.1Rhys Weatherley2009-11-151-0/+8
| * Make isSharing() reset to false when context no longer sharingRhys Weatherley2009-11-153-1/+7
| * Make it clear that the two semi-floating widget should overflow.Jan-Arve Sæther2009-11-131-2/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-133-10/+9
| |\
| | * Fixed a regression in mainwindow that would not restore correctlyThierry Bastian2009-11-131-3/+2
| | * Fixed stroking of cosmetic dashed pens with the GL2 paint engine.Kim Motoyoshi Kalland2009-11-131-6/+3
| | * Fixed dockwidget autotest on X11Thierry Bastian2009-11-131-1/+4
| * | Remove warning. (Forgot to commit this together with my previous commits)Jan-Arve Sæther2009-11-131-1/+1
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-136-19/+90
| |\
| | * QItemSelectionModel: fixed selection not kept when layout change and everythi...Olivier Goffart2009-11-132-8/+62
| | * Fixing and adding autotests for QTreeWidgetThierry Bastian2009-11-131-4/+24
| | * Fixed stroking of discontinuous paths with the GL2 engine.Kim Motoyoshi Kalland2009-11-132-4/+3
| | * Fix QAbstractSlider testOlivier Goffart2009-11-131-3/+1
| * | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-136-370/+210
| |\ \ | | |/ | |/|
| | * QGAL: clean up size hint refresh codeCaio Marcelo de Oliveira Filho2009-11-122-65/+25
| | * QGAL: clean up interpolation codeCaio Marcelo de Oliveira Filho2009-11-122-95/+16
| | * QGAL: remove the caching of simplified graphCaio Marcelo de Oliveira Filho2009-11-123-72/+22
| | * QGAL: fix update size hints logic in parallel anchorsCaio Marcelo de Oliveira Filho2009-11-121-6/+13
| | * QGAL: Update code documentationEduardo M. Fleury2009-11-121-13/+26
| | * QGAL: Move size information from AnchorData to QGraphicsAnchorPrivateEduardo M. Fleury2009-11-123-108/+66
| | * QGAL: Update header documentation in QGALPrivateEduardo M. Fleury2009-11-121-9/+14
| | * QGAL (Test): Add test to ensure persistency of user-defined spacingEduardo M. Fleury2009-11-121-0/+26
| | * QGAL (Test): Fix order of parameters in QCOMPAREEduardo M. Fleury2009-11-121-2/+2
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-135-13/+25
| |\ \
| | * | Fixed maximized dialogs losing maximized status on orientation switchMiikka Heikkinen2009-11-131-7/+9
| | * | Highlighted text colour correction for s60styleJanne Koskinen2009-11-131-1/+1
| | * | Fix corelib def files for the new atomics implementationShane Kearns2009-11-122-4/+14
| | * | Fix MWC warningShane Kearns2009-11-121-1/+1
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-s60axis2009-11-1277-751/+1178
| | |\ \
| * | \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-13102-645/+1988
| |\ \ \ \
| | * | | | Speed up QTextFormatCollection::indexForFormatJos van den Oever2009-11-132-21/+59
| | * | | | Early return for allowMove within a parent QModelIndexStephen Kelly2009-11-132-22/+47
| | * | | | Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-13162-233/+1073
| | |\ \ \ \
| | * | | | | Fixed: QCalendarWidget::showNextMonth() followed by a click on the navigation...Olivier Goffart2009-11-132-0/+84
| | * | | | | Fixes QGraphicsWidget: paint() being called before polish().Bjørn Erik Nilsen2009-11-132-0/+35
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-1342-292/+1193
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-122-17/+21
| | | |\ \ \ \
| | | | * | | | Made the select button commit the T9 word rather than exit widget.axis2009-11-121-8/+20
| | | | * | | | Removed unused variable.axis2009-11-122-9/+1
| | | | | |/ / | | | | |/| |
| | | * | | | QTreeWidget visualRect now returns the rect for all columnsThierry Bastian2009-11-121-1/+8
| | | * | | | Make the render() test pass when pixmaps aren't 32 bit.Paul Olav Tvete2009-11-121-1/+4
| | | * | | | Fix QT_NO_PHONON_SETTINGSGROUPJørgen Lind2009-11-123-4/+14
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-1232-250/+1066
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-122-3/+28
| | | | |\ \ \
| | | | | * \ \ Merge branch 'focusOutBug' into 4.6axis2009-11-122-3/+28
| | | | | |\ \ \