summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-131-9/+2
|\
| * Remove accidental left over debugging outputAaron Kennedy2009-11-121-9/+2
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-123-4/+16
|\ \ | |/ |/|
| * Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-111-3/+11
| |\
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-40/+12
| | |\
| | * \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-094-95/+96
| | |\ \
| | * | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| * | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-118-200/+242
| |\ \ \ \
| * | | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| * | | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-118-200/+242
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-104-65/+134
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-094-85/+154
| | |/ /
| * | | 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
| * | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-90/+78
| |\ \ \ | | |_|/ | |/| |
| | * | Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
* | | | Make consistent timer mode more consistentAaron Kennedy2009-11-111-4/+14
|/ / /
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0629-223/+272
|\ \ \
| * | | Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| * | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0612-136/+142
| |\ \ \
| | * \ \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-062-0/+4
| | |\ \ \
| | | * | | Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | * | | | Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-052-0/+12
| | | |\ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0412-210/+101
| | | |\ \ \ \
| | | * | | | | Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | * | | | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-063-7/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-065-125/+121
| | | |\ \ \ \ \ \
| | | * | | | | | | add support for the N'Ko writing system to QtLars Knoll2009-11-061-2/+2
| | | * | | | | | | fix painting on Windows CEMaurice Kalinowski2009-11-061-2/+2
| | | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-063-0/+18
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Don't crash in QStateMachine when event transition listens toEskil Abrahamsen Blomfeldt2009-11-051-3/+2
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Move the check for HWND to be right after the CreateWindow() callAndy Shaw2009-11-061-3/+4
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-061-0/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Doc: Fixed qdoc warnings.David Boddie2009-11-051-0/+6
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-0551-856/+1984
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Updating documentation to reflect actual behaviorJoão Abecasis2009-11-041-9/+11
| | * | | | | Further fixes to file size handling on Windows with fd and FILE*João Abecasis2009-11-041-17/+26
| | * | | | | Don't try to mmap past EOFJoão Abecasis2009-10-281-0/+6
| | * | | | | Fix silly error in bit fiddlingJoão Abecasis2009-10-261-1/+1
| | * | | | | Fix QFile::isSequential on WindowsJoão Abecasis2009-10-231-19/+10
| | * | | | | On Windows, report a 0 file size for streams and other funny filesJoão Abecasis2009-10-231-5/+2
| | * | | | | Check for non-zero return from fseekJoão Abecasis2009-10-231-4/+4
| | * | | | | Get file position when attaching an open file descriptor to QFileJoão Abecasis2009-10-211-1/+6
| | * | | | | Fixes some issues with large files in 32-bit systemsJoão Abecasis2009-10-212-2/+5
| | * | | | | (Windows) Don't create a file mapping for each view that is mappedJoão Abecasis2009-10-213-62/+34
| | * | | | | Fix 32/64-bit issues with QFile::map/unmap() on *nix systemsJoão Abecasis2009-10-212-11/+22