summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2514-11/+205
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-246-5/+32
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-2211-7/+174
| |\
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2211-7/+174
* | | Fix compile on symbian better.Thomas Zander2010-03-222-4/+4
* | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-2231-1163/+2014
|\ \ \ | |/ /
| * | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| |/
| * Added support for video surfaces to Phonon MMF backendGareth Stockwell2010-03-1828-1163/+1982
* | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-192-4/+4
* | Fixed wrong qmake logic for Symbian.axis2010-03-181-2/+1
* | This should likely get webkit linking again on windows/sbsv2Thomas Zander2010-03-171-0/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-172-6/+9
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-164-12/+27
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-152-2/+2
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1120-1115/+318
| |\ \ \ \
| * | | | | Use the same concept for per-lib tweaks as armccThomas Zander2010-03-091-4/+6
| * | | | | Merge branch 'defFilesAndMisc'axis2010-03-081-1/+1
| |\ \ \ \ \
| | * | | | | Switched to using DEF_FILE, which is the official variable.axis2010-03-081-1/+1
| * | | | | | Do the correct thing for make sis for webkitThomas Zander2010-03-041-1/+1
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-017-13/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-23422-62395/+61944
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-1616-197/+756
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-167-23/+35
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1232-135/+681
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Move duplicated code out to a qmake featureThomas Zander2010-02-091-8/+1
| * | | | | | | | | Fix include to work on case-sensitive filesystems.Thomas Zander2010-02-041-1/+1
| * | | | | | | | | Make webkit compile on linux+armccaxis2010-02-041-3/+9
* | | | | | | | | | QtScript: Fix regression when calling newQObject() from native constructorKent Hansen2010-03-161-1/+1
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-15336-9104/+21908
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-11336-9104/+21908
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Fix compilation with namespaced QtKent Hansen2010-03-111-3/+3
| | * | | | | | | | CompileKent Hansen2010-03-111-0/+4
| | * | | | | | | | Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-10336-9104/+21904
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-154-12/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-113-2/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-113-2/+15
| * | | | | | | | Merge branch 'mmfphonon' into 4.6Frans Englich2010-03-101-10/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix SDP files are not supported.Frans Englich2010-03-101-10/+12
* | | | | | | | | make it possible to use sse2 with mingwThierry Bastian2010-03-112-2/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-071-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-051-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixed case of GL include directoryMark Brand2010-03-051-1/+1
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-065-8/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-055-8/+21
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Fixa few warnings on mingwThierry Bastian2010-03-051-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Some cleanup of outdated src/3rdparty stuffaavit2010-03-0313-1106/+15
* | | | | | | Compile on WinCEaavit2010-02-251-0/+281
| |_|_|_|_|/ |/| | | | |
* | | | | | make QtScript compatible with mingw 64Thierry Bastian2010-02-241-3/+3
* | | | | | WinCE compilation fixaavit2010-02-241-1/+1
* | | | | | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-233350-284441/+131453