summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-0827-648/+912
|\
| * Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2Simon Hausmann2010-05-0718-52/+225
| * Updated WebKit to e4b73bb0b173f21db8f0de3dae885a8a71282996Simon Hausmann2010-05-064-3/+17
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-05-069-19/+108
| |\
| * | Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3Simon Hausmann2010-05-0515-598/+675
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-073-6/+21
|\ \ \ | |_|/ |/| |
| * | Fix build error for S60 3.1 winscw targetDerick Hawcroft2010-05-052-5/+20
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-041-1/+1
| |\ \ | | |/ | |/|
| | * Gstreamer mediaservice backend: fixed check for X11/QWS build.Dmytro Poplavskiy2010-05-041-1/+1
* | | 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
| * | | | | | | | qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-032-2/+10
| | * | | | | | | Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| | |/ / / / / /
| | * | | | | | Fixed OpenGL version flags for versions > 3.2.Kim Motoyoshi Kalland2010-05-031-1/+14
| | * | | | | | Do not link QtGui in benchmarks which don't need itGordon Schumacher2010-05-036-2/+5
| | * | | | | | Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and Q...Jan-Arve Sæther2010-05-0310-149/+16
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0256-297/+1886
| | |\ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-0258-302/+1913
| | |\ \ \ \ \ \ | |/ / / / / / /