summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed useless comments.axis2010-06-291-4/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2825-141/+365
|\
| * Enable SSE2 for MSVC x64 builds, as it was incorrectly disabledJohn Brooks2010-06-282-5/+4
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-285-5/+56
| * ignore *.vcxproj.userOswald Buddenhagen2010-06-281-0/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-2818-126/+258
| |\
| | * Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-28100-1114/+2810
| | |\
| | * \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25921-23048/+12696
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-23290-8113/+3695
| | | |\ \
| | | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | * | | | Doc: Fixed links in the QML documentation.David Boddie2010-06-182-15/+15
| | * | | | Doc: Changed links to explicitly refer to QML objects.David Boddie2010-06-181-11/+11
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-18115-649/+2071
| | |\ \ \ \
| | * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| * | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2837-257/+402
|\ \ \ \ \ \ \
| * | | | | | | Fix build with def files on armSimon Hausmann2010-06-281-0/+2
| * | | | | | | Build fix for src/plugins/phonon/mmfGareth Stockwell2010-06-281-93/+121
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2736-161/+276
| |\ \ \ \ \ \ \
| | * | | | | | | Make symbian/unix shadow builds work again.Thomas Zander2010-06-251-1/+1
| | * | | | | | | Change the files to camelcase as avkon now does thatThomas Zander2010-06-258-7/+15
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2527-153/+260
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update EABI and WINSCW DEF files for SymbianIain2010-06-255-0/+18
| | | * | | | | | | Fix linking on arm with def filesSimon Hausmann2010-06-251-0/+2
| | | * | | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595a...Simon Hausmann2010-06-251-3/+5
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2420-150/+235
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.axis2010-06-241-2/+4
| | | | * | | | | | | Fixed make runonphone that looked for the package in the wrong place.axis2010-06-241-3/+7
| | | | * | | | | | | Fixed several problems with the postlinker for Symbian (elf2e32).axis2010-06-243-11/+151
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2417-136/+75
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-06-2413-133/+65
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Revert "Fixing the race condition in event dispatcher implementation on"axis2010-06-242-56/+10
| | | | | | * | | | | | | Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"axis2010-06-242-66/+40
| | | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-241-1/+1
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3...Simon Hausmann2010-06-241-1/+1
| | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-231-3/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | Allow TLW translucency on Symbian without Qt::FramelessWindowHintGareth Stockwell2010-06-231-3/+0
| | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-233-3/+3
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Updated UIDs for spectrum demoGareth Stockwell2010-06-233-3/+3
| | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-233-2/+6
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Ensure that compiling with the no debug/warning output defines worksAndy Shaw2010-06-233-2/+6
| | | | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-183/+199
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / /
| | | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-183/+199
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | | * | | | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906f...Simon Hausmann2010-06-221-4/+3
| | | | | | | * | | | | | | | Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| | | | | | | * | | | | | | | Make sure ValueRecord's DeviceTables are cleaned up on failureAndreas Kling2010-06-221-2/+3
| | | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-176/+191
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-228-176/+191
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | Fix null HB_Device** dereference on exit in Harfbuzz GPOS codeAndreas Kling2010-06-214-17/+21