summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2726-3343/+619
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-223-3/+18
| |\
| | * apply msvc flags to wince tooRomain Pokrzywka2010-09-212-2/+2
| | * fix qt static build on winceRomain Pokrzywka2010-09-211-0/+15
| | * Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-1/+1
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2124-3340/+601
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-161-2/+2
| | |\
| | | * Fixed incorrect Symbian scoping.axis2010-09-161-2/+2
| | * | Update add libconninet version 0.45.Aaron McCarthy2010-09-1634-0/+6836
| | * | Remove libconninet in preperation to updating it to version 0.45.Aaron McCarthy2010-09-1636-9977/+0
| | |/
| | * Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-133-5/+7
|\ \ \
| * \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1315-61/+403
| |\ \ \ | | | |/ | | |/|
| * | | Make phonon gst backend build properlyJørgen Lind2010-09-073-5/+7
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1316-65/+403
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1014-59/+401
| |\ \ \ | | | |/ | | |/|
| | * | QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-082-2/+2
| | * | QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-082-1/+13
| | * | QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-081-4/+4
| | * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-079-6/+298
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-067-3/+291
| | | |\ \
| | | | * | Reduce memory consumption of QtScript/JSC on SymbianKent Hansen2010-09-027-3/+291
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-061-2/+2
| | | |\ \ \
| | | | * | | Fixed incorrect Symbian scoping.axis2010-09-061-2/+2
| | | | |/ /
| | | * | | Ensure WebView gets focus when an editable node is clicked on.Martin Jones2010-09-061-1/+5
| | | |/ /
| | * | | Doc: More work on the QML documentation.David Boddie2010-09-071-28/+58
| | * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-031-3/+3
| | |\ \ \ | | | |/ /
| | | * | QString usage cleanupsOswald Buddenhagen2010-09-011-3/+3
| | * | | Doc: qdoc fixes.David Boddie2010-09-021-4/+4
| | |/ /
| | * | fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| * | | Remove unused local variable in myanmar shaper of harfbuzzJiang Jiang2010-09-071-4/+0
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-302-2/+2
| |\ \ \ | | |/ /
| | * | fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-6/+0
| | * | let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-233-2/+8
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-257-140/+64
| |\ \ \ | | |/ /
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-197-140/+64
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1922-189/+242
| |\ \ \ | | | |/ | | |/|
| | * | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | * | Add version 0.42 of libconninet.Aaron McCarthy2010-08-1636-0/+9977
| | * | Remove version 0.41 of libconninet.Aaron McCarthy2010-08-1639-10054/+0
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1923-78/+207
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-13114-133/+13595
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-129-6/+63
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
| | | |\
| | | | * Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
| | | * | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
| | | |/
| | | * Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-08-0612-42/+114
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-042-4/+4
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-0311-41/+113
| | | |\ \