summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-144-58/+394
|\
| * Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-074-58/+394
| |\
| | * Fix compile errorShane Kearns2010-12-031-0/+2
| | * Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-023-18/+42
| | |\
| | * \ Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-2319-56/+88
| | |\ \
| | * | | Use QSystemError to return errors from QFileSystemEngineShane Kearns2010-10-121-6/+34
| | * | | Create QSystemError classShane Kearns2010-10-083-58/+357
| | * | | Merge commit 'origin/master' into fileEnginesThomas Zander2010-10-062-15/+31
| | |\ \ \
| | * \ \ \ Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-2814-58/+287
| | |\ \ \ \
| | * | | | | Move rootPath, homePath, tempPath, currentPath and setCurrentPathShane Kearns2010-09-201-0/+7
* | | | | | | QPointer: thread safetyOlivier Goffart2010-12-131-0/+2
|/ / / / / /
* | | | | | QScroller merge, part 1Robert Griebl2010-12-022-0/+5
| |_|_|_|/ |/| | | |
* | | | | avoid the warning about comparison between signed and unsigned integersKonstantin Ritt2010-11-301-1/+1
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-252-16/+36
|\ \ \ \ \
| * | | | | Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-2/+2
| * | | | | Compile when USER_TIMER_MINIMUM isn't definedBradley T. Hughes2010-11-221-1/+1
| * | | | | Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
| * | | | | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-111-0/+7
* | | | | | Do not define METHOD if QT_NO_KEYWORD is defined.Olivier Goffart2010-11-221-2/+6
| |_|_|_|/ |/| | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-9/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-092-4/+9
| |\ \ \ \
| | * \ \ \ Merge branch 'QT-4077-fix' into 4.7-s60axis2010-11-052-4/+9
| | |\ \ \ \
| | | * | | | Fixed event starvation with pointer events on Symbian.axis2010-11-052-4/+9
| * | | | | | Doc: Removed note about some Qt classes working without an application.David Boddie2010-11-041-5/+4
| |/ / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-032-3/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-032-3/+8
| |\ \ \ \ \ \
| | * | | | | | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-011-0/+7
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-291-3/+1
| | |\ \ \ \ \ \
| | | * | | | | | Simplify object lifetime management when moving objects to a QThreadBradley T. Hughes2010-10-291-3/+1
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-032-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-032-0/+10
| |/ / / / / / /
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Fix a few typos in comments and docs.Jason McDonald2010-11-011-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-295-7/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-265-36/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-222-0/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-0/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-0/+8
| | * | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-058-131/+214
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-135-26/+78
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-195-24/+25
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-052-15/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-278-32/+205
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-136-26/+82
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-263-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1912-261/+183
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-052-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-034-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-042-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-194-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |