summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2931-102/+594
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | |\
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | | | | | | | | |\
| | | | | | | | | | * Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2931-806/+1820
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix location of QtMultimedia def filesShane Kearns2010-05-281-3/+0
| * | | | | | | | | | | Freeze 4.7 def files on top of 4.6.3Shane Kearns2010-05-287-113/+827
| * | | | | | | | | | | Update def files for 4.6.3Shane Kearns2010-05-285-752/+122
| * | | | | | | | | | | Add runtime_graphics_system flag to QApplicationPrivate.Jani Hautakangas2010-05-286-5/+12
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2824-54/+995
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add missign license headers.Jason McDonald2010-05-282-0/+82
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2722-54/+913
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-27201-1521/+2729
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2723-56/+915
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2623-56/+915
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-26182-616/+280053
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2010-05-252-2/+17
| | | | | * | | | | | | | | | | Make link on linux/symbianThomas Zander2010-05-251-0/+1
| | | | | * | | | | | | | | | | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | | * | | | | | | | | | | Fix for QRuntimePixmapData serial number setting.Jani Hautakangas2010-05-251-1/+3
| | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2520-58/+911
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2220-58/+911
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-216-14/+140
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | Enable QTouchEvent for S60 5.0Shane Kearns2010-05-213-12/+45
| | | | | | | | | | * | | | | | | | | | | Add missing license header.Jason McDonald2010-05-211-0/+41
| | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | | | | | Fix build error on S60 3.1 environmentsMiikka Heikkinen2010-05-201-2/+2
| | | | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201616-68573/+33936
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
| | | | | | | | | | | | * | | | | | | | | | | | QRuntimeGraphicsSystemJani Hautakangas2010-05-2017-42/+821
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2841-930/+1336
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolutionOlivier Goffart2010-05-281-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolutionThiago Macieira2010-05-281-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2840-929/+1335
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2740-929/+1335
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-271-0/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-271-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi2010-05-271-0/+4