summaryrefslogtreecommitdiffstats
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-06-301-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-3078-149/+195
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2973-147/+168
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | 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 'buildSystemFixes' into 4.7-s60axis2010-06-2971-142/+163
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-293-6/+7
| | | * | | | | | | | | | | | | | Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | | * | | | | | | | | | | | | | Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | * | | | | | | | | | | | | | Various fixes to autotests when using the symbian/linux-armcc mkspec.axis2010-06-2958-65/+81
| | | * | | | | | | | | | | | | | Fixed Symbian resources not honoring TARGET with a path.axis2010-06-292-63/+66
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-291-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Removed useless comments.axis2010-06-291-4/+0
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| | | | | | |_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-297-13/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-291-22/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | warn about stray meta dataOswald Buddenhagen2010-06-292-4/+8
| | | * | | | | | | | | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-294-0/+30
| | | * | | | | | | | | | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
| | | * | | | | | | | | | | | | Improved QCommandLinkButton's vertical spacingJohn Brooks2010-06-291-5/+13
| | | * | | | | | | | | | | | | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3
| | | * | | | | | | | | | | | | 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-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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |