summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-307-3/+32
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-292-1/+5
| |\
| | * Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| | * Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-291-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-285-2/+27
| | | | |\
| | | | | * Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
* | | | | | Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
|/ / / / /
* | | | | Improved QCommandLinkButton's vertical spacingJohn Brooks2010-06-291-5/+13
* | | | | added a comment for QByteArray::replace(..)Zeno Albisser2010-06-291-0/+5
|/ / / /
* | | | When application calls QNetworkSession::close() or QNetworkSession::stop(), m...Jukka Rissanen2010-06-291-22/+33
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2811-33/+121
|\ \ \
| * | | 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
| * | | 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-2857-874/+1329
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25203-8735/+4214
| |\ \ \
| * | | | 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/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2821-237/+223
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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-2720-141/+97
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Change the files to camelcase as avkon now does thatThomas Zander2010-06-251-7/+7
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2519-134/+90
| | |\ \ \
| | | * | | 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-2412-131/+65
| | | |\ \ \
| | | | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-06-2410-130/+62
| | | | |\ \ \
| | | | | * | | 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
| | | | | * | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3...Simon Hausmann2010-06-241-1/+1
| | | | | * | | Allow TLW translucency on Symbian without Qt::FramelessWindowHintGareth Stockwell2010-06-231-3/+0
| | | | | * | | 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
| | | | | |\ \ \
| | | | | | * | | 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
| | | | | | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andy Shaw2010-06-2123-115/+410
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-216-34/+45
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b6...Simon Hausmann2010-06-203-33/+8
| | | | | | | | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-203-1/+37
| | | | | | | | * | | | | Prevent warnings about EPOCROOT coming out when not on symbianAndy Shaw2010-06-211-125/+125
| | | | | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-2221-141/+448
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-223-40/+33
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | |