summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-178-28/+115
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-162-11/+45
| |\
| | * QTextCodec::codecForName. Insert in the cache in all cases.Olivier Goffart2010-02-151-1/+3
| | * Bump version to 4.6.3.Jason McDonald2010-02-151-2/+2
| | * QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec ...Olivier Goffart2010-02-121-5/+6
| | * Add caching to QTextCodec::codecForName and QTextCodec::codecForMibOlivier Goffart2010-02-121-4/+35
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-166-19/+56
| |\ \
| | * | Fixed compiler warning about making the same class a friend twiceZeno Albisser2010-02-161-0/+2
| | * | Fix a deadlock in kqueue implementation of QFileSystemWatcherBradley T. Hughes2010-02-161-4/+14
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-161-14/+21
| | |\ \
| | | * | Fix for using QContiguousCache with default constructor or capacity=0Zeno Albisser2010-02-151-14/+21
| | * | | doc: Added \section1 about serializing operators for Qt collections.Martin Smith2010-02-161-0/+7
| | |/ /
| | * | Ignore touch and gesture events when excluding input eventsDenis Dzyubenko2010-02-121-0/+11
| | * | doc: Fixed several typos.Martin Smith2010-02-121-1/+1
| | |/
| * | Partial upgrade packages for QtCore and QtGuiShane Kearns2010-02-161-0/+16
| |/
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132-2/+2
|\ \
| * | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-101-1/+1
| |\ \
| | * | Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | doc: Fixed several typos.Martin Smith2010-02-121-3/+3
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-125-15/+40
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-101-1/+1
| |\ \
| | * | Take into account the solaris-cc-64-stlport mkspecPierre Rossi2010-02-101-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-082-9/+39
| |\ \ \ | | |/ / | |/| |
| | * | Make QTextCodec reentrant.Olivier Goffart2010-02-082-9/+39
* | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-105-42/+29
|\ \ \ \
| * \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-095-42/+29
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-061-2/+2
| | |\ \ | | | |/ | | |/|
| | | * A fix for accidently reused variable names in nested iterations.Zeno Albisser2010-02-051-2/+2
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+3
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+3
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| | | | |\
| | | | | * Merge commit 'origin/4.6' into 4.6-oslo2Rohan McGovern2010-02-041-4/+4
| | | | | |\
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-031-0/+3
| | | | | |\ \
| | | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-021-0/+3
| | | | | | |\ \
| | | | | | | * | Document that QModelIndex::child does not work for the root itemOlivier Goffart2010-02-021-0/+3
| | * | | | | | | add constOswald Buddenhagen2010-02-051-1/+1
| | |/ / / / / /
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-049-19/+30
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Revert "Daylight savings time for Symbian take 2"Janne Koskinen2010-02-042-39/+23
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-092-1/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added new mouse cursor types.Denis Dzyubenko2010-02-052-1/+13
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-083-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | A few trivial optimizationsThorbjørn Lindeijer2010-02-052-2/+2
| * | | | | | | QAbstractItemModel docs: Fix typo.ck2010-02-011-1/+1
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-043-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-1/+0
| * | | | | | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-042-1/+2
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0416-62/+119
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |