summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1631-262/+699
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| | |\ | |/ /
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-165-20/+52
| | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a886...Simon Hausmann2010-06-161-1/+1
| | * Buildfix for MSVC2008 (C90 violation)Andreas Kling2010-06-151-2/+4
| | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc846...Simon Hausmann2010-06-1523-180/+912
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| | |\ | |/ /
| | * VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-151-0/+158
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jason McDonald2010-06-1513-117/+226
| | |\ \ | | |/ / | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-1519-24/+24
| |\ \ \
| * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-155-89/+53
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | |\ \ \ \
| | | | * | | | Fix issues with thai line breakingLars Knoll2010-06-145-89/+53
| | | | | | * | Add skeleton changes files for 4.6.4.Jason McDonald2010-06-151-0/+158
| | | | | |/ /
| | | | | * | Bump version number after 4.6.3 release.Jason McDonald2010-06-1519-24/+24
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-16144-4171/+6212
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-16144-4171/+6212
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-15144-4171/+6212
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use native locale aware string comparison on Symbian.Denis Dzyubenko2010-06-151-0/+4
| | | * | | | | | | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-152-3/+11
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-15264-1143/+3480
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix symbian building of TARGET with a slashThomas Zander2010-06-152-3/+3
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-15138-3792/+6089
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix a minor typo in QAbstractItemModel's documentation.Robin Burchell2010-06-141-1/+1
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-14137-3791/+6088
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | QXmlSchema: allow usage of xsd:allPeter Hartmann2010-06-142-0/+37
| | | | | | * | | | | | | QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | | * | | | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-154-446/+178
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-14135-3791/+6047
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-12135-3791/+6047
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix symbian-abld build failure with bearer pluginsMiikka Heikkinen2010-06-114-2/+4
| | | | | * | | | | | | | | remove certificate bundlePeter Hartmann2010-06-113-1992/+0
| | | | | * | | | | | | | | make QSslSocket::systemCaCertificates() use system certsPeter Hartmann2010-06-113-20/+138
| | | | | * | | | | | | | | Adjusted RegExp in QSslCertificate::fromPath()Zeno Albisser2010-06-111-1/+1
| | | | | * | | | | | | | | Fix QSystemTrayIcon::supportsMessages() on Windowsminiak2010-06-117-22/+31
| | | | | * | | | | | | | | Use NIM_SETVERSION to get the latest behaviorminiak2010-06-111-16/+71
| | | | | * | | | | | | | | Cleanup obsolete stuffminiak2010-06-112-58/+4
| | | | | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-11482-8230/+22567
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Fixed a broken merge.Denis Dzyubenko2010-06-112-66/+0
| | | | | | * | | | | | | | | Changed the way we detect touch screen on Windows.Denis Dzyubenko2010-06-112-32/+36
| | | | | | * | | | | | | | | Fixed error deploying qsymbianbearer.qtplugin on Symbian.Rohan McGovern2010-06-111-1/+1
| | | | | | * | | | | | | | | Revert "Attempt to fix build failure on Symbian."Aaron McCarthy2010-06-111-2/+2
| | | | | | * | | | | | | | | Attempt to fix build failure on Symbian.Aaron McCarthy2010-06-111-2/+2
| | | | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-10114-868/+5026
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B...Constantin Makshin2010-06-103-6/+3
| | | | | | | * | | | | | | | | Updated leading whitespace to make indentation more consistentConstantin Makshin2010-06-103-3/+3