summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1014-66/+129
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1014-66/+129
| |\
| | * PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-101-1/+1
| | * Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1013-57/+111
| | |\
| | | * Improvements to anchoring docsBea Lam2010-12-091-0/+2
| | | * QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0912-54/+93
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0912-54/+93
| | | | |\
| | | | | * Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
| | | | | * Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-0916-71/+133
| | | | | |\
| | | | | * | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-092-11/+21
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0811-41/+68
| | | | | |\ \
| | | | | | * | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-081-4/+8
| | | | | | * | Update QtGui def filesJoona Petrell2010-12-072-0/+2
| | | | | | * | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-067-36/+58
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-067-36/+58
| | | | | | | |\ \
| | | | | | | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| | | | | | | | * | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-063-0/+11
| | | | | | | | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-062-22/+29
| | | | | | | | * | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-101-5/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Missing glyphs in GL when scaling QStaticText and QML text itemsEskil Abrahamsen Blomfeldt2010-12-101-5/+13
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-102-4/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't include <features.h> directly: non-standard header.Thiago Macieira2010-12-101-3/+2
| * | | | | | | | | Remove superfluous OpenGL linking for QtDeclarativeThiago Macieira2010-12-101-1/+0
| |/ / / / / / / /
* | | | | | | | | Corrected case on Symbian library.axis2010-12-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-092-4/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-092-4/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Try using pure scissor clip in GL 2 engine for rotations.Samuel Rødal2010-12-091-1/+5
| | * | | | | | | Fixed DeviceCoordinateCache items when using QGraphicsScene::render().Samuel Rødal2010-12-091-2/+2
| | * | | | | | | Fixed missing text in GL 2 engine after recreating a context.Samuel Rødal2010-12-091-1/+3
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-094-148/+188
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Runtime dependency on Symbians Font Table APIAlessandro Portale2010-12-093-147/+181
| * | | | | | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-095-5/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove whitespace and leading tab from documentation changeSami Merila2010-12-081-1/+1
| * | | | | | Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integrationSami Merila2010-12-081-0/+3
| |\ \ \ \ \ \
| | * | | | | | Adding warning to QMenu documentationKarim Pinter2010-11-261-0/+3
| * | | | | | | Merge commit 'refs/merge-requests/2512' of gitorious.org:qt/qt into integrationSami Merila2010-12-071-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Updating merge request 2512Karim Pinter2010-12-071-3/+1
| | * | | | | | | Removes the reseting of the QMenu offset.Karim Pinter2010-11-291-0/+4
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-063-4/+18
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-031-0/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cacheJohn Tapsell2010-12-032-2/+7
| * | | | | | | | Fix integer overflow in bitfieldJan-Arve Sæther2010-12-031-1/+1
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-024-3/+42
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0111-55/+121
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-3025-332/+659
| |\ \ \ \ \ \ \ \ \ \