summaryrefslogtreecommitdiffstats
path: root/src
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-167-18/+53
|\
| * Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| * Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-163-10/+29
| * Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
| * Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1624-256/+509
|\ \
| * | 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/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-153-4/+4
| |\ \
| | * | Bump version number after 4.6.3 release.Jason McDonald2010-06-153-4/+4
| * | | 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
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1664-2306/+555
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1664-2306/+555
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1564-2306/+555
| | |\ \ \ \ \ \
| | | * | | | | | Use native locale aware string comparison on Symbian.Denis Dzyubenko2010-06-151-0/+4
| | | * | | | | | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-151-3/+8
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1563-2305/+545
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix a minor typo in QAbstractItemModel's documentation.Robin Burchell2010-06-141-1/+1
| | | | * | | | | | QXmlSchema: allow usage of xsd:allPeter Hartmann2010-06-142-0/+37
| | | | * | | | | | QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1460-2304/+503
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1260-2304/+503
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | 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-11234-1165/+3493
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | 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
| | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1044-130/+254
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | 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
| | | | | | | | * | | | | | Updated project files so it is now possible to use "-system-zlib" configurati...Constantin Makshin2010-06-1012-28/+52
| | | | | | | | * | | | | | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-1011-24/+22
| | | | | | | | * | | | | | actually fix namespaced compileOswald Buddenhagen2010-06-101-2/+0
| | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1023-69/+177
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0923-69/+177
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | Attempt to fix build failure on Linux introduced by 09c6a81109Andreas Kling2010-06-091-3/+2
| | | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0923-69/+178
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0823-69/+178
| | | | | | | | | | | |\ \ \ \ \ \