Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 41 | -251/+317 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2011-06-16 | 6 | -31/+35 |
| |\ | |||||
| | * | Fixes to how resize event and layout request are posted. | Jan-Arve Saether | 2011-06-10 | 5 | -22/+29 |
| | * | Fixed move a QGraphicsWidget and invalidate its layout at the same time | John Tapsell | 2011-05-27 | 1 | -2/+1 |
| | * | Fix infinite recursion when changing geometry on Mac | Gabriel de Dietrich | 2011-05-26 | 1 | -7/+5 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-06-10 | 1 | -2/+5 |
| |\ \ | |||||
| | * | | Fixing OpenGL module build error on Solaris | Martin Pejcoch | 2011-06-10 | 1 | -2/+5 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-10 | 2 | -2/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-09 | 2 | -0/+28 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-06-09 | 1 | -7/+20 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Limit the cookies count per domain to 50. | Jocelyn Turcotte | 2011-06-09 | 1 | -7/+20 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-09 | 14 | -291/+198 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-06-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Update internal state before emitting configurationChanged() signals. | Xizhi Zhu | 2011-06-08 | 1 | -0/+1 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-08 | 1 | -10/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-07 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-07 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-06 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-04 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-04 | 5 | -36/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Revert some of "Make QMLViewer startup animation stop after a while" | Alan Alpert | 2011-06-03 | 3 | -36/+0 |
| | * | | | | | | | | | | | Add private method for flushing the pixmap cache. | Michael Brasser | 2011-06-02 | 2 | -0/+16 |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-06-01 | 5 | -8/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Avoid buffer overrun in QMacPixmapData resizing | Jiang Jiang | 2011-05-31 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting | Eskil Abrahamsen Blomfeldt | 2011-05-31 | 1 | -0/+9 |
| | * | | | | | | | | | | | | Missing glyphs transforming QStaticText on X11/raster with subpixel AA | Eskil Abrahamsen Blomfeldt | 2011-05-30 | 2 | -7/+11 |
| | * | | | | | | | | | | | | Fixed clipping errors for non-extended paint engines. | Samuel Rødal | 2011-05-30 | 1 | -0/+9 |
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-01 | 2 | -28/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | QDeclarative: Fix QPerformanceTimer on Symbian | Kai Koehne | 2011-06-01 | 2 | -28/+29 |
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-01 | 3 | -17/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-30 | 4 | -29/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-28 | 7 | -11/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 14 | -108/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 14 | -108/+38 |
| * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-26 | 23 | -8/+2892 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 3 | -7/+81 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix boundry conditions for cursor hit test | Jiang Jiang | 2011-05-25 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Fix cursor position test on CursorOnCharacter case | Jiang Jiang | 2011-05-25 | 3 | -4/+9 |
| | * | | | | | | | | | | | | | | | | Merge remote branch 'mainline/4.7' into 4.7 | Jiang Jiang | 2011-05-24 | 25 | -486/+622 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Fix xToCursor issue due to backporting from 4.8 | Jiang Jiang | 2011-05-24 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | Support placing cursor in ligature with mouse or touch | Jiang Jiang | 2011-05-23 | 3 | -7/+74 |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | fix the "Host" header for ipv6 URLs in QNAM | shiroki | 2011-05-25 | 1 | -1/+11 |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Flickable could flick in wrong direction if given too few touch samples | Martin Jones | 2011-05-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix the state of default network configuration. | Xizhi Zhu | 2011-05-24 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-22 | 11 | -215/+215 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-20 | 1 | -22/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |