summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2010Jason McDonald2010-01-0690-90/+90
* Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-171-4/+4
|\
| * Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| * Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-163-153/+16
| * Changes to support locale change event for symbian platformdka2009-12-153-16/+153
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-162-1/+4
|\ \
| * | Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| * | Fixed invalid read in QCache::unlink after recent change.Samuel Rødal2009-12-111-1/+2
| * | Prevented leak of keys in QPixmapCache.Samuel Rødal2009-12-101-1/+1
| * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| |/
* | qreal-izationAleksandar Sasha Babic2009-12-111-2/+2
|/
* Fixed (unstable) tst_QTimeLine::currentTime test failureRohan McGovern2009-12-091-1/+1
* Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of oslo-staging-1/4.6...Simon Hausmann2009-12-051-4/+4
|\
| * Fix Run-Time Check Failure with MSVC when downcasting.Thiago Macieira2009-12-031-4/+4
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-031-2/+4
|\ \ | |/
| * Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-011-2/+4
* | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
|/
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-173-9/+37
|\
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-161-3/+28
| * Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
* | do not (fail to) compile qdatastream into qmake and cetestOswald Buddenhagen2009-11-134-4/+4
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+20
|\ \ | |/
| * Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-113-65/+153
| * Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-111-40/+12
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-105-45/+30
|\ \
| * \ Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-103-65/+133
| |\ \
| * | | Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| | |/ | |/|
| * | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-093-5/+18
| |\ \
| | * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-063-5/+18
* | | | build lrelease bootstrappedOswald Buddenhagen2009-11-104-6/+4
| |_|/ |/| |
* | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-093-85/+153
|/ /
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-4/+4
|\ \
| * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-062-3/+3
| |\ \
| | * \ Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | * | add support for the N'Ko writing system to QtLars Knoll2009-11-061-2/+2
| | |/
| * | Avoid warning on 64 bit systemsJan-Arve Sæther2009-11-041-1/+1
| |/
* | use pragma push/popHarald Fernengel2009-11-062-3/+11
* | Fix MSVC compiler warning.Friedemann Kleint2009-11-051-1/+1
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-048-100/+226
|\ \ | |/
| * Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-028-100/+226
| |\
| | * Fix compilation in QContiguousCache.Thiago Macieira2009-10-291-3/+3
| | * Initialise the reserved bits to 0.Thiago Macieira2009-10-287-4/+11
| | * Fix Qt containers to properly support types with strict alignments.Thiago Macieira2009-10-288-36/+150
| | * Add some STL compatibility for QContiguousCache and private inheritanceThiago Macieira2009-10-281-60/+65
* | | Make QStringBuilder respect codecForCStringsHarald Fernengel2009-11-043-21/+62
* | | fix canReadLine() erroneously returning trueOswald Buddenhagen2009-11-031-0/+27
|/ /
* | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-1/+3
|\ \
| * | QLocale: AM/PM symbol support for symbian platformdka2009-10-281-1/+3
| |/