summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-109-162/+214
|\
| * 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-upstream' into 4.7-docA-Team2010-12-097-8/+17
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-291-3/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-281-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2725-213/+246
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2620-81/+258
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2532-170/+647
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2414-87/+118
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-232-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix filtering of columns in QSFPM.Stephen Kelly2010-11-231-2/+2
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-12-0917-72/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | QT::Window palette brush fails to render correctly.Jani Hautakangas2010-12-091-2/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | QLabel wordwrap to respect maximumSizeJanne Koskinen2010-12-091-1/+1
* | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0817-70/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prevent out-of-bounds memory access in drawhelper.Samuel Rødal2010-12-081-0/+2
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-0810-54/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-081-12/+5
| | * | | | | | | | | | | | | | | | Support for 'qglTranslucent' in QGLWindowSurface.Michael Dominic K2010-12-081-1/+19
| | * | | | | | | | | | | | | | | | Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| | * | | | | | | | | | | | | | | | Fixed cubic bezier rendering bug in qgrayraster.Samuel Rødal2010-12-081-1/+1
| | * | | | | | | | | | | | | | | | Revert "qgrayraster: Speed up rendering of small cubic splines."Samuel Rødal2010-12-081-16/+20
| | * | | | | | | | | | | | | | | | Fix QWingedEdge memory usage issueJiang Jiang2010-12-081-7/+7