summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-236-12/+277
|\
| * Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-216-12/+277
| |\
| | * QFile API: add API to specify if adopted file handles should be closedShane Kearns2010-12-206-12/+277
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-233-9/+1
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-213-9/+1
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-131-9/+43
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-101-3/+2
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-081-7/+7
| | |\ \ \ \
| | * | | | | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-011-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-272-107/+97
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-261-0/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Removed two warnings from QDirIterator docsGeir Vattekar2010-11-261-6/+0
| | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-253-2/+16
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-244-6/+16
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-233-17/+41
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-221-14/+34
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Doc: Removed incorrect statement about the C locale.David Boddie2010-11-221-2/+0
* | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-202-9/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Add a small protection against releasing a timer twice.Thiago Macieira2010-12-131-2/+12
| * | | | | | | | | | | Use constants the timer ID masks instead of values everywhereThiago Macieira2010-12-131-4/+8
| * | | | | | | | | | | Fix ABA problem with: the serial must be updated on all accessesThiago Macieira2010-12-131-1/+1
| * | | | | | | | | | | Comment a bit more the timer ID allocation code.Thiago Macieira2010-12-131-2/+22
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-1438-2819/+6021
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix warnings, whitespace cleanupJoão Abecasis2010-12-142-1/+5
| * | | | | | | | | | | Don't rely on uninitialized dataJoão Abecasis2010-12-131-0/+3
| * | | | | | | | | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-0738-2819/+6014
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix QDir::relativeFilePathJoão Abecasis2010-12-061-1/+1
| | * | | | | | | | | | | Fix spelling in commentsJoão Abecasis2010-12-052-2/+2
| | * | | | | | | | | | | Define _WIN32_WINNT before any includesJoão Abecasis2010-12-051-4/+4
| | * | | | | | | | | | | New attempt at fixing compilation failureJoão Abecasis2010-12-052-6/+4
| | * | | | | | | | | | | Removing unused duplicate definitionsJoão Abecasis2010-12-051-27/+0
| | * | | | | | | | | | | No symbolic links in Windows CEJoão Abecasis2010-12-041-0/+2
| | * | | | | | | | | | | Set minimum target Windows version to 2000João Abecasis2010-12-042-0/+8
| | * | | | | | | | | | | More missing includesJoão Abecasis2010-12-042-0/+3
| | * | | | | | | | | | | Add missing includeJoão Abecasis2010-12-041-0/+1
| | * | | | | | | | | | | Fix compile errorShane Kearns2010-12-031-0/+2
| | * | | | | | | | | | | Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-0222-227/+325
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix buffered/unbuffered mode issues on symbianShane Kearns2010-11-302-3/+9
| | * | | | | | | | | | | | Fix compile error on symbianShane Kearns2010-11-301-0/+4
| | * | | | | | | | | | | | Let's use engine's understanding of relative pathJoão Abecasis2010-11-252-2/+6
| | * | | | | | | | | | | | Fix compile error on WindowsPrasanth Ullattil2010-11-241-0/+4
| | * | | | | | | | | | | | Adding #ifdefs/#defines lost in the merge to masterJoão Abecasis2010-11-235-12/+22
| | * | | | | | | | | | | | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-23110-286/+1803
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | QFileSystemEngine: remove symbian code from Unix-specific implementationJoão Abecasis2010-11-221-51/+0
| | * | | | | | | | | | | | | QFileSystemEngine: clean up unused codeJoão Abecasis2010-11-224-45/+10
| | * | | | | | | | | | | | | Windows: fix QFile::symLinkTargetShane Kearns2010-11-171-1/+1
| | * | | | | | | | | | | | | Fix QFile::resize on windows for files opened from a FILE*Shane Kearns2010-11-161-3/+7
| | * | | | | | | | | | | | | QFile: Fix compilationJoão Abecasis2010-11-161-1/+1