Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 2 | -0/+73 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 5 | -23/+344 |
| |\ | |||||
| * | | Revert "Revert "Fix QNetworkConfigurationManager usage outside main thread fi... | Shane Kearns | 2011-06-13 | 2 | -1/+74 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-23 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Add an SSE4.2 even simpler version of toLatin1 | Thiago Macieira | 2011-06-22 | 1 | -0/+4 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-23 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Skip boundry neutral characters in bidi itemization | Jiang Jiang | 2011-06-22 | 1 | -0/+1 |
| * | | | | Merge remote branch 'qt-mainline/4.8' | aavit | 2011-06-22 | 81 | -198/+1562 |
| |\ \ \ \ | |||||
| * | | | | | Update autotest case after toHtml change | Jiang Jiang | 2011-06-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-06-23 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix autotest build failure in qdatetime | Honglei Zhang | 2011-06-21 | 1 | -1/+0 |
* | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-22 | 3 | -20/+300 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 3 | -20/+300 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | 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 | 2 | -20/+259 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fixes to how resize event and layout request are posted. | Jan-Arve Saether | 2011-06-10 | 1 | -20/+172 |
| | | * | | | | | Fixed move a QGraphicsWidget and invalidate its layout at the same time | John Tapsell | 2011-05-27 | 1 | -0/+73 |
| | | * | | | | | Fix infinite recursion when changing geometry on Mac | Gabriel de Dietrich | 2011-05-26 | 1 | -0/+14 |
| | * | | | | | | 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 | -0/+41 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Limit the cookies count per domain to 50. | Jocelyn Turcotte | 2011-06-09 | 1 | -0/+41 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-22 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | skip two subtests that are known to fail on QNX | Ritt Konstantin | 2011-06-21 | 2 | -3/+3 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-21 | 13 | -194/+1523 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix js debugging autotest on Windows + Add license header | Kai Koehne | 2011-06-15 | 3 | -12/+65 |
| * | | | | | | | | Rewrite autotests for js debugging | Aurindam Jana | 2011-06-14 | 7 | -111/+1370 |
| * | | | | | | | | Rename qdeclarativescriptdebugging autotest directory | Kai Koehne | 2011-06-14 | 4 | -7/+7 |
| * | | | | | | | | Create property cache in case of Component{} root | Aaron Kennedy | 2011-06-10 | 3 | -0/+17 |
| * | | | | | | | | Fixed compile of tst_qscriptextensionplugin on some Windows configurations | Rohan McGovern | 2011-06-01 | 1 | -0/+1 |
* | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 109 | -158/+5828 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-06-15 | 2 | -4/+39 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Also test http proxy in the QTcpServer benchmark | Shane Kearns | 2011-06-13 | 1 | -0/+6 |
| | * | | | | | | | Enable QTcpServer benchmark on symbian | Shane Kearns | 2011-06-13 | 2 | -4/+33 |
| * | | | | | | | | Allow selecting fonts with irregular style names | Jiang Jiang | 2011-06-10 | 1 | -0/+13 |
| * | | | | | | | | Fix missing empty lines in Qt HTML when displayed in compliant browsers | Eskil Abrahamsen Blomfeldt | 2011-06-10 | 1 | -1/+25 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-08 | 1 | -0/+63 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Implemented QAccessibleTextEdit::attributes() | José Millán Soto | 2011-06-06 | 1 | -0/+55 |
| | * | | | | | | | Changing cursor position in all boundaries | José Millán Soto | 2011-06-06 | 1 | -0/+8 |
| * | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 68 | -80/+4821 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7 | Toby Tomkins | 2011-06-08 | 9 | -11/+35 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7 | Toby Tomkins | 2011-06-08 | 4 | -5/+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-08 | 4 | -5/+5 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | | * | | | | | | Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. | Marko Niemelä | 2011-06-08 | 4 | -5/+5 |
| | * | | | | | | | | Merge branch '4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-06 | 1 | -0/+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-01 | 1 | -0/+20 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | Fix QTreeWidget autotest cases on Symbian/VGA | Sami Merila | 2011-06-01 | 1 | -0/+20 |
| | * | | | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-06-01 | 3 | -73/+9 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | 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 | -74/+10 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | Revert "Fix QNetworkConfigurationManager usage outside main thread first" | Shane Kearns | 2011-05-31 | 2 | -74/+1 |
| | | | * | | | | | | Fix tst_QGraphicsItem::sorting() test case for Symbian | Miikka Heikkinen | 2011-05-31 | 1 | -0/+9 |
| | * | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / |