summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * 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 '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
| | |\ \
| | | * | Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-021-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | doc: Fixed many qdoc errors.Martin Smith2010-08-021-1/+1
| * | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| | |_|/ | |/| |
| * | | Phonon; Use correct Phonon version numbers.Justin McPherson2010-08-042-4/+4
| |/ /
| * | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| * | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| |/
| * Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| * Add libgq version 0.4+0m6.Aaron McCarthy2010-07-2826-0/+2830
| * Add libconninet version 0.41+0m6.Aaron McCarthy2010-07-2840-0/+10072
* | Replace gluOrtho2d with glOrtho.Bjørn Erik Nilsen2010-08-101-1/+1
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-065-25/+25
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-1/+1
|/
* QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-271-6/+4
* Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-07-236-2/+54
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-211-1/+1
|\
| * Fix a typo in harfbuzz thai line breaking.Ritt Konstantin2010-07-211-1/+1
* | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+10
|\ \ | |/ |/|
| * Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
* | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-1660-182/+1004
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-102-1/+5
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-102-1/+5
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
| |\ \ \ | | |/ / | |/| |
| | * | Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-081-22/+25
| |\ \ \ | | |/ / | |/| |
| | * | Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)Charles Yin2010-07-081-22/+25
* | | | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-082-1/+5
|\ \ \ | |/ / |/| |
| * | Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-071-1/+1
| * | Consolidate sql driver configuration redundancyMark Brand2010-07-071-0/+4
| |/
* | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
* | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17