Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 14 | -11/+205 |
|\ | |||||
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-24 | 6 | -5/+32 |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-22 | 11 | -7/+174 |
| |\ | |||||
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-22 | 11 | -7/+174 |
* | | | Fix compile on symbian better. | Thomas Zander | 2010-03-22 | 2 | -4/+4 |
* | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 31 | -1163/+2014 |
|\ \ \ | |/ / | |||||
| * | | Fixed updating the VKB display when inputting into QGraphicsWebView. | axis | 2010-03-22 | 3 | -0/+32 |
| |/ | |||||
| * | Added support for video surfaces to Phonon MMF backend | Gareth Stockwell | 2010-03-18 | 28 | -1163/+1982 |
* | | gcc for Symbian doesn't support gcc extensions like atomicity.h - disable | Iain | 2010-03-19 | 2 | -4/+4 |
* | | Fixed wrong qmake logic for Symbian. | axis | 2010-03-18 | 1 | -2/+1 |
* | | This should likely get webkit linking again on windows/sbsv2 | Thomas Zander | 2010-03-17 | 1 | -0/+1 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 2 | -6/+9 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 4 | -12/+27 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-15 | 2 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 20 | -1115/+318 |
| |\ \ \ \ | |||||
| * | | | | | Use the same concept for per-lib tweaks as armcc | Thomas Zander | 2010-03-09 | 1 | -4/+6 |
| * | | | | | Merge branch 'defFilesAndMisc' | axis | 2010-03-08 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Switched to using DEF_FILE, which is the official variable. | axis | 2010-03-08 | 1 | -1/+1 |
| * | | | | | | Do the correct thing for make sis for webkit | Thomas Zander | 2010-03-04 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 7 | -13/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 422 | -62395/+61944 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 16 | -197/+756 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 7 | -23/+35 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 32 | -135/+681 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Move duplicated code out to a qmake feature | Thomas Zander | 2010-02-09 | 1 | -8/+1 |
| * | | | | | | | | | Fix include to work on case-sensitive filesystems. | Thomas Zander | 2010-02-04 | 1 | -1/+1 |
| * | | | | | | | | | Make webkit compile on linux+armcc | axis | 2010-02-04 | 1 | -3/+9 |
* | | | | | | | | | | QtScript: Fix regression when calling newQObject() from native constructor | Kent Hansen | 2010-03-16 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-15 | 336 | -9104/+21908 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-11 | 336 | -9104/+21908 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix compilation with namespaced Qt | Kent Hansen | 2010-03-11 | 1 | -3/+3 |
| | * | | | | | | | | Compile | Kent Hansen | 2010-03-11 | 1 | -0/+4 |
| | * | | | | | | | | Update src/3rdparty/javascriptcore and adapt src/script to the changes | Kent Hansen | 2010-03-10 | 336 | -9104/+21904 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 4 | -12/+27 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-11 | 3 | -2/+15 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-11 | 3 | -2/+15 |
| * | | | | | | | | Merge branch 'mmfphonon' into 4.6 | Frans Englich | 2010-03-10 | 1 | -10/+12 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix SDP files are not supported. | Frans Englich | 2010-03-10 | 1 | -10/+12 |
* | | | | | | | | | make it possible to use sse2 with mingw | Thierry Bastian | 2010-03-11 | 2 | -2/+2 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | fixed case of GL include directory | Mark Brand | 2010-03-05 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 5 | -8/+21 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-03-05 | 5 | -8/+21 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Fixa few warnings on mingw | Thierry Bastian | 2010-03-05 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Some cleanup of outdated src/3rdparty stuff | aavit | 2010-03-03 | 13 | -1106/+15 |
* | | | | | | | Compile on WinCE | aavit | 2010-02-25 | 1 | -0/+281 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | make QtScript compatible with mingw 64 | Thierry Bastian | 2010-02-24 | 1 | -3/+3 |
* | | | | | | WinCE compilation fix | aavit | 2010-02-24 | 1 | -1/+1 |
* | | | | | | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ... | Jocelyn Turcotte | 2010-02-23 | 3350 | -284441/+131453 |