summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-259-21/+45
|\
| * Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-241-1/+1
| |\
| * | Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDotBernhard Rosenkraenzer2010-03-233-3/+13
| * | QFSFileEngine: don't look through NTFS junctionsRitt Konstantin2010-03-231-8/+2
| * | _close(fd) closes the associated handle and not the other way aroundJoão Abecasis2010-03-233-2/+22
| * | Do not use FSEvents-based filesystemwatcher backend on Mac.Denis Dzyubenko2010-03-221-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-222-7/+7
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-192-7/+7
| | |\ \
| | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-194-9/+13
| | | |\ \
| | | * | | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-172-7/+7
| | | * | | Port QtCore uses of QTime as a stopwatch to QTimestamp.Thiago Macieira2010-03-172-7/+7
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-256-80/+302
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix error reporting when symbian file copy fails.Shane Kearns2010-03-242-2/+42
| * | | | | QIODevice::read() and QFile::atEnd() performance improvementsmread2010-03-244-78/+260
* | | | | | Fix compilation for winCEThierry Bastian2010-03-241-1/+2
* | | | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-231-2/+1
| |/ / / / |/| | | |
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-2/+6
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Removed extra space from the command line passed to QProcess in SymbianMiikka Heikkinen2010-03-191-2/+6
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-194-9/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-6/+10
| |\ \ \ | | |/ /
| | * | Handle Symbian's file name encoding, correctly.Alessandro Portale2010-03-161-6/+10
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-173-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-2/+1
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-151-1/+1
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-118-5/+44
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-016-17/+37
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-234-6/+23
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-193-14/+8
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-1618-611/+599
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-126-40/+56
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2173-218/+355
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-1814-255/+261
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'possible_qmake_scope_fixes'axis2009-12-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixed qmake scope specification.axis2009-10-231-1/+1
| | * | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-067-214/+254
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fixed incorrect header includes.axis2009-10-232-2/+2
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-176-117/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-156-117/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix QDir::entryList regressionJoão Abecasis2010-03-121-3/+3
| | * | | | | | | | | | | | | | Fix qmake crash on WindowsJoão Abecasis2010-03-111-5/+1
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-116-116/+86
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | doc: Fixed three new qdoc errors.Martin Smith2010-03-113-6/+4
| | | * | | | | | | | | | | | | Merge remote branch 'origin/4.7-cutoff' into 4.7Morten Johan Sørvig2010-03-101-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | QFSFileEngine reduce number of system callsRitt Konstantin2010-03-093-21/+33
| | | * | | | | | | | | | | | | remove unneeded code from QFileInfoRitt Konstantin2010-03-092-55/+3
| | | * | | | | | | | | | | | | QFSFileEngine: Don't use owner's permissions for current user; calculate them...Ritt Konstantin2010-03-092-12/+22
| | | * | | | | | | | | | | | | In QFSFileEngine::fileFlags call getPermissions() only if entry existsRitt Konstantin2010-03-091-24/+17
| | | * | | | | | | | | | | | | move permissions calculation code to separate methodRitt Konstantin2010-03-092-28/+37
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-151-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |