summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-162-2/+2
|\
| * Fix copyright year.Jason McDonald2010-02-162-2/+2
* | doc: Fixed some qdoc errors.Martin Smith2010-02-161-0/+1
|/
* Add operator< and qHash for QSharedPointer and fix operator-.Thiago Macieira2010-02-151-2/+47
* Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)Thiago Macieira2010-02-141-32/+31
* Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)Thiago Macieira2010-02-132-3/+3
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-134-72/+164
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-134-72/+164
| |\
| | * Optimized QLocale to access system locale on demand.Denis Dzyubenko2010-02-123-60/+158
| | * Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPathJoão Abecasis2010-02-111-12/+6
* | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-044-25/+55
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-034-25/+55
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | |_|/ / / | | |/| | | |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-038-21/+53
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-0312-46/+72
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-032-2/+16