summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-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
| | * Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface alr...Michael Dominic K2010-12-081-1/+8
| | * Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.Samuel Rødal2010-12-071-5/+8
| | * Fix text disappearing on GL when RGB-path is taken (no transformation)Eskil Abrahamsen Blomfeldt2010-12-071-8/+11
| | * Fix for GCC on Windows x64.Ruben Van Boxem2010-12-071-7/+7
| | * Fix crash in QTextDocument::markContentsDirtyJiang Jiang2010-12-061-2/+4
| | * Make sure to do a deep copy of a QImage when it's being painted on.Samuel Rødal2010-12-062-8/+25
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-085-16/+26
| |\ \
| | * | Update .def files after 783a278f243c6411f5f32d11f2165b9eed9b6f8cTor Arne Vestbø2010-12-081-2/+4
| | * | Proxy mode was not correctly checked.Jukka Rissanen2010-12-081-2/+2
| | * | Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-073-12/+20
| | |/
| * | Fixed a BC break between S60 SDK 3.2 and 5.0.axis2010-12-071-0/+7
| |/
* | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| * | | Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-031-0/+3
|\ \ \ \ | |/ / /
| * | | Mention that image providers should be added before loading QML filesBea Lam2010-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
|\ \ \ \ | |/ / /
| * | | Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| * | | Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| * | | Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| * | | Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0111-55/+121
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-12/+26
| |\ \ \
| | * | | ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-011-34/+47
| |\ \ \ \
| | * | | | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01141-1044/+2288
| | |\ \ \ \
| | * | | | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-011-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8