summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-017-13/+12
|\
| * 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
| * 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-233333-130656/+283652
| |\
| | * 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
| | * Compilation fix for Symbianaavit2010-02-221-1/+3
| | * Compilation fix for AIXaavit2010-02-221-1/+1
| | * Fix compilation on WindowsOlivier Goffart2010-02-221-1/+1
| | * Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-211-2/+2
| * | Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21299-68175/+34128
| |\ \ | | |/
| * | WinCE doesn't have sys/types.hThiago Macieira2010-02-201-1/+1
| * | Merge remote branch 'origin/master'Thiago Macieira2010-02-20130-10073/+43669
| |\ \
| * | | 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-23422-62395/+61944
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20299-68175/+34128
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
| | |\ \
| | | * | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | | * | Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | | * | Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| | * | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | * | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | | Delete libjpeg 6baavit2010-02-1690-33896/+0
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-192-7/+7
| |\ \ \ \
| | * | | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-162-7/+7
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-191-0/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-0/+4
| | |/ /
| * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-157-23/+35
| |\ \ \ | | |/ /
| | * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-127-23/+35
| | |\ \ | | | |/ | | |/|
| * | | Our modifications to libpngaavit2010-02-151-2/+12
| * | | Add libpng 1.4.0aavit2010-02-15124-0/+85998
| * | | Delete libpng 1.2.40aavit2010-02-15121-52416/+0
| |/ /
* | | 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 remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-099-59/+218
| |\ \
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-048-14/+55
| |\ \ \
| * \ \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0217-70/+363
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-017-15/+54
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-012-2/+2
| |\ \ \ \ \ \
| | * | | | | | build fix for phonon on winceThierry Bastian2010-01-252-2/+2
| | * | | | | | Merge branch '4.6'Thiago Macieira2010-01-219-24/+70
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1814-14/+52
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1342-242/+1614
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1229-501/+837
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-087-9/+54
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-0514-24/+1618
| | |\ \ \ \ \ \ \ \ \ \ \