Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 47 | -6864/+339 |
|\ | |||||
| * | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 36 | -6859/+7 |
| |\ | |||||
| | * | Removing libconninet 3rdparty component. | Aaron McCarthy | 2010-09-28 | 35 | -6854/+0 |
| | * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-24 | 11 | -5/+332 |
| | |\ | |||||
| | * | | Clarified documentation of loadFinished() signal. | Jerome Pasion | 2010-09-24 | 1 | -5/+7 |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 11 | -5/+332 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2 | Simon Hausmann | 2010-09-24 | 11 | -5/+332 |
| | |/ | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 26 | -3343/+619 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 3 | -3/+18 |
| |\ \ | | |/ | |||||
| | * | apply msvc flags to wince too | Romain Pokrzywka | 2010-09-21 | 2 | -2/+2 |
| | * | fix qt static build on wince | Romain Pokrzywka | 2010-09-21 | 1 | -0/+15 |
| | * | Enable building Qt/Webkit with debug symbols | Anders Bakken | 2010-09-20 | 1 | -1/+1 |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 24 | -3340/+601 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-09-16 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Fixed incorrect Symbian scoping. | axis | 2010-09-16 | 1 | -2/+2 |
| | * | | Update add libconninet version 0.45. | Aaron McCarthy | 2010-09-16 | 34 | -0/+6836 |
| | * | | Remove libconninet in preperation to updating it to version 0.45. | Aaron McCarthy | 2010-09-16 | 36 | -9977/+0 |
| | |/ | |||||
| | * | Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988 | Simon Hausmann | 2010-09-12 | 18 | -71/+473 |
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 3 | -5/+7 |
|\ \ \ | |||||
| * \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 15 | -61/+403 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Make phonon gst backend build properly | Jørgen Lind | 2010-09-07 | 3 | -5/+7 |
* | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 16 | -65/+403 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 14 | -59/+401 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | QtWebKit: Update tag files to match the same content on qtwebkit.git | Jocelyn Turcotte | 2010-09-08 | 2 | -2/+2 |
| | * | | QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. | Jocelyn Turcotte | 2010-09-08 | 2 | -1/+13 |
| | * | | QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. | Jocelyn Turcotte | 2010-09-08 | 1 | -4/+4 |
| | * | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-07 | 9 | -6/+298 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-09-06 | 7 | -3/+291 |
| | | |\ \ | |||||
| | | | * | | Reduce memory consumption of QtScript/JSC on Symbian | Kent Hansen | 2010-09-02 | 7 | -3/+291 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-09-06 | 1 | -2/+2 |
| | | |\ \ \ | |||||
| | | | * | | | Fixed incorrect Symbian scoping. | axis | 2010-09-06 | 1 | -2/+2 |
| | | | |/ / | |||||
| | | * | | | Ensure WebView gets focus when an editable node is clicked on. | Martin Jones | 2010-09-06 | 1 | -1/+5 |
| | | |/ / | |||||
| | * | | | Doc: More work on the QML documentation. | David Boddie | 2010-09-07 | 1 | -28/+58 |
| | * | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-03 | 1 | -3/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | QString usage cleanups | Oswald Buddenhagen | 2010-09-01 | 1 | -3/+3 |
| | * | | | Doc: qdoc fixes. | David Boddie | 2010-09-02 | 1 | -4/+4 |
| | |/ / | |||||
| | * | | fix qt_webkit_version.pri install for in-Qt builds | Oswald Buddenhagen | 2010-08-31 | 1 | -13/+21 |
| * | | | Remove unused local variable in myanmar shaper of harfbuzz | Jiang Jiang | 2010-09-07 | 1 | -4/+0 |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | fix build after first webkit self-injection attempt | Oswald Buddenhagen | 2010-08-23 | 1 | -6/+0 |
| | * | | let WebKit inject itself into the qt configuration | Oswald Buddenhagen | 2010-08-23 | 3 | -2/+8 |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 7 | -140/+64 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 7 | -140/+64 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 22 | -189/+242 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | qdoc: Reorganized the QML elements table to be a dictionary... | Martin Smith | 2010-08-16 | 1 | -0/+1 |
| | * | | Add version 0.42 of libconninet. | Aaron McCarthy | 2010-08-16 | 36 | -0/+9977 |
| | * | | Remove version 0.41 of libconninet. | Aaron McCarthy | 2010-08-16 | 39 | -10054/+0 |
* | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 23 | -78/+207 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-13 | 114 | -133/+13595 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7 | Justin McPherson | 2010-08-12 | 9 | -6/+63 |
| | |\ |