summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix crash with stylesheet if widget change style in the changeEventOlivier Goffart2010-05-072-11/+40
* Fix textdrawing under GL on N900.Gunnar Sletta2010-05-073-33/+60
* Fixed bug in QIODevice::read after first reading 0 bytes.Samuel Rødal2010-05-072-0/+29
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0717-103/+385
|\
| * Fix auto-test failure on Mac/Linux/QWS.Alexis Menard2010-05-071-4/+0
| * Some EGL implementations does not return a EGLNativeDisplayTypeJørgen Lind2010-05-061-1/+1
| * Fixed the sizing of the dock area with fixed size dock widgetsThierry Bastian2010-05-052-31/+19
| * QSortFilterProxyModel: Warning or assert failureGabriel de Dietrich2010-05-052-1/+62
| * Performance issue with QGraphicsItem::ItemClipsChildrenToShape.Bjørn Erik Nilsen2010-05-056-5/+152
| * Fixes crash in QGraphicsItem::mouseMove for untransformable items.Bjørn Erik Nilsen2010-05-051-1/+5
| * Pack Graphics View booleans in quint32 bit fields.Bjørn Erik Nilsen2010-05-054-49/+53
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0512-176/+340
| |\
| | * Fix a bug in QGraphicsItem::scroll.Alexis Menard2010-05-051-3/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-042-5/+21
| | |\
| | | * Fixed the position of the dock widget when undockedThierry Bastian2010-05-042-5/+21
| * | | Fixes regression: SVG image loading would fail from QBuffer with pos!=0aavit2010-05-052-4/+69
| | |/ | |/|
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-059-19/+108
|\ \ \ | |_|/ |/| |
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-049-19/+108
| |\ \ |/ / /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-041-3/+5
| |\ \
| | * | When one of the spin button subcontrol is activated, the state member ofKevin Ottens2010-05-041-3/+5
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-041-1/+1
| |\ \
| | * | fix crash in QLocalServer::close on WindowsJoerg Bornemann2010-05-041-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-041-2/+3
| |\ \ \
| | * | | QS60Style: QTabWidget icon size property doesn't workSami Merila2010-05-041-2/+3
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-041-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-031-1/+1
| | |\ \ \ | |/ / / /
| | * | | PowerVR screen driver using undefined symbolsRhys Weatherley2010-05-031-1/+1
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-032-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-032-1/+1
| | |\ \ \ \ | |/ / / / /
| | * | | | rename qt_iw.ts to qt_he.tsOswald Buddenhagen2010-05-032-1/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-031-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | QS60Style: QComboBoxPrivateScroller draws holes into menu canvasSami Merila2010-05-031-0/+2
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-032-11/+94
| |\ \ \ \ \ | | |/ / / /
| | * | | | QS60Style: QTabWidget Usability issue with capacitive screensSami Merila2010-05-032-11/+94
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-031-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixing small memory leak in testlib.Aleksandar Sasha Babic2010-05-031-0/+1
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| |\ \ \ \ \
| | * | | | | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
| | |\ \ \ \ \
| | | * | | | | Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0359-367/+1959
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-0312-89/+215
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0358-364/+1950
| | |\ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| | * | | | | | QGraphicsView drawing artifacts due to rounding errors.Bjørn Erik Nilsen2010-05-036-80/+194
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-036-9/+21
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| * | | | | | | Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
| * | | | | | | only add phonon and scripttools dependencies if they're available, otherwise ...Romain Pokrzywka2010-05-031-3/+7
| * | | | | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-05-031-2/+2