Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 63 | -25/+4781 |
|\ | |||||
| * | 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 | 2 | -1/+21 |
| |\ | |||||
| | * | Fix QHeaderView test case for VGA Symbian devices. | Miikka Heikkinen | 2011-05-30 | 1 | -1/+11 |
| | * | Fix QMenuBar autotest failures for Symbian | Sami Merila | 2011-05-30 | 1 | -0/+10 |
| * | | 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 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | QToolButton autotest trigger() fails in E6 | Sami Merila | 2011-05-27 | 1 | -1/+1 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 1 | -3/+2 |
| |\ \ | |||||
| | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 1 | -3/+2 |
| * | | | 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 | 58 | -1/+4757 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed more CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 2 | -0/+82 |
| | * | | Fixed CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 40 | -61/+306 |
| | * | | Fixing Linux compatibility issues for Symbian | Tomi Vihria | 2011-05-25 | 1 | -1/+1 |
| | * | | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1 | Marko Niemelä | 2011-05-25 | 58 | -1/+4430 |
| | * | | Revert "Fixing Linux compatibility issues for Symbian" | Laszlo Agocs | 2011-05-25 | 1 | -1/+1 |
| * | | | Merge remote branch 'mainline/4.7' into 4.7 | Jiang Jiang | 2011-05-24 | 2 | -1/+11 |
| |\ \ \ | |||||
| * | | | | Support placing cursor in ligature with mouse or touch | Jiang Jiang | 2011-05-23 | 1 | -0/+25 |
* | | | | | Merge branch '4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-05-27 | 20 | -56/+560 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-27 | 19 | -50/+504 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'earth-staging/master' | Olivier Goffart | 2011-05-26 | 8 | -33/+98 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Update bearer startup code in network autotests | Shane Kearns | 2011-05-25 | 8 | -33/+98 |
| | * | | | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge remote branch 'qt-qml-review/master' into master-qml-staging | Kai Koehne | 2011-05-23 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | | license header check: fix exception for URL TLD table | Peter Hartmann | 2011-05-25 | 1 | -1/+1 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-24 | 1704 | -29274/+29297 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | * | | | | | | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore | Robert Hogan | 2011-05-24 | 2 | -2/+28 |
| | * | | | | | | | | add auto test for SSL certificates containing utf8 characters | Pierre Rossi | 2011-05-23 | 4 | -5/+58 |
| | * | | | | | | | | Add QUuid::toRfc4122() and fromRfc4122() | Liang Qi | 2011-05-20 | 2 | -0/+34 |
| | * | | | | | | | | Add QUuid::toByteArray() and relevant | Liang Qi | 2011-05-20 | 2 | -0/+38 |
| | * | | | | | | | | Add some autotests and benchmarks for QUuid | Liang Qi | 2011-05-20 | 2 | -2/+152 |
| | * | | | | | | | | tst_qhostinfo: Fix IPv6 lookup detection on Windows. | Martin Petersson | 2011-05-20 | 1 | -7/+7 |
| | * | | | | | | | | Tests for QtConcurrent::map using lambdas | Olivier Goffart | 2011-05-19 | 1 | -0/+21 |
| | * | | | | | | | | Support of lambdas in QtConcurrent::run | Olivier Goffart | 2011-05-19 | 1 | -0/+67 |
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-26 | 1 | -4/+54 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | skip the ipv6 Host checking for the moment, since it fails on Windows XP. wil... | shiroki | 2011-05-26 | 1 | -0/+1 |
| | * | | | | | | | | | fix "Host" header of ipv6 URLs in QNAM | shiroki | 2011-05-25 | 1 | -9/+9 |
| | * | | | | | | | | | add test case for ipv6 url parsing | shiroki | 2011-05-20 | 1 | -4/+53 |
| * | | | | | | | | | | QDeclarativeDebug: Fix autotest on Windows/MSVC | Kai Koehne | 2011-05-24 | 1 | -1/+1 |
| * | | | | | | | | | | Merge remote-tracking branch 'qt/4.8' into master-qml-team | Kai Koehne | 2011-05-24 | 1842 | -32598/+43414 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | QDeclarativeDebug: Fix autotest | Kai Koehne | 2011-05-20 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-24 | 3 | -1/+30 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | 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 | -0/+17 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Fix ligature offset in multi-line text | Jiang Jiang | 2011-05-20 | 1 | -0/+17 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-20 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Notify when the TextInput cursorRectangle property changes within pre-edit | Andrew den Exter | 2011-05-20 | 1 | -0/+10 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Fixing Linux compatibility issues for Symbian | Tomi Vihria | 2011-05-18 | 1 | -1/+1 |
* | | | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-20 | 66 | -954/+978 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-05-20 | 3 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Increased EPOCHEAPSIZE for qpainter benchmark | Miikka Heikkinen | 2011-05-18 | 1 | -0/+2 |