summaryrefslogtreecommitdiff
path: root/src/3rdparty/webkit
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-311-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-301-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-301-2/+2
| | |\
| | | * Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-271-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-261-0/+3
| | |\ \ | | | |/
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2514-11/+205
| | |\ \
* | | \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-317-39/+305
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-307-39/+305
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3029-150/+526
|\ \ \ \ \ | |/ / / /
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-293-3/+14
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2925-135/+468
| | |/ / | |/| |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2914-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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-231-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-221-0/+3
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-211-0/+3
| | |\ \ \
| | | * | | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile an...Thiago Macieira2010-03-211-0/+3
* | | | | | Fix compile on symbian better.Thomas Zander2010-03-221-2/+2
|/ / / / /
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-0/+32
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | |/ | |/|
* | | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-191-2/+2
| |/ |/|
* | 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 into 4.7-s60axis2010-03-163-2/+15
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-153-2/+15
| |\ \ | | |/
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-113-2/+15
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-114-7/+20
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-075-8/+21
| |\ \ | | |/
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-055-8/+21
* | | 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-013-6/+3
|\ \ \ | |/ /
| * | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-233350-284441/+131453
| * | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-234-21/+15
| * | Fix compilation on WindowsOlivier Goffart2010-02-231-1/+1
| * | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-231-2/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233331-130654/+283648
| |\ \
| | * | Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6...Jocelyn Turcotte2010-02-234-15/+21
| | * | Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ce...Jocelyn Turcotte2010-02-233331-130665/+283653
| | * | Fix compilation on WindowsOlivier Goffart2010-02-221-1/+1
| | * | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-211-2/+2
| * | | Merge remote branch 'origin/master'Thiago Macieira2010-02-201-0/+4
| |\ \ \ | | |/ /
| * | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-3/+0
| | |/ | |/|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-0/+4
|\ \ \ | | |/ | |/|
| * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-0/+4
| |/
View Lorry Controller Status