summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Expand)AuthorAgeFilesLines
* Squashed merge of the master-temp branch.David Boddie2011-05-062-2/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-032-3/+1
|\
| * Merge remote-tracking branch 'earth-team/master' into earth-staging-masterOlivier Goffart2011-04-202-3/+1
| |\
| | * Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-122-3/+1
| | |\
| | | * Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke...Shane Kearns2011-04-1111-201/+183
| | | |\
| | | * \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-2520-18/+49
| | | |\ \
| | | * \ \ Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ...Shane Kearns2011-03-081-2/+0
| | | |\ \ \
| | | | * | | bugfix: QDir::entryList(Files|Readable) not listing writable filesShane Kearns2011-02-241-2/+0
| | | | * | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-0775-149/+456
| | | | |\ \ \
| | | | * | | | Fix for using search paths with a dirty pathShane Kearns2011-02-031-1/+1
| | | | * | | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1533-2761/+5587
| | | | |\ \ \ \
| | | * | \ \ \ \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-0890-2919/+6059
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Prototype socket managerShane Kearns2010-12-011-1/+1
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-1811-229/+207
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-182-181/+98
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge earth-team into origin/master'Olivier Goffart2011-04-121-13/+15
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-077-16/+73
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix compilationOlivier Goffart2011-04-041-2/+2
| | * | | | | | | | QTemporaryFile: Locate placeholder before re-encodingJoão Abecasis2011-04-041-31/+40
| | * | | | | | | | Prefer use of QByteArray to qstrdup and manual memory managementJoão Abecasis2011-04-041-9/+6
| | * | | | | | | | Check for null no longer neededJoão Abecasis2011-04-041-2/+0
| | * | | | | | | | Don't overrun XXXXXX placeholder when generating next filenameJoão Abecasis2011-04-041-3/+1
| | * | | | | | | | Split argument validation of _gettemp as separate functionJoão Abecasis2011-04-041-25/+51
| | * | | | | | | | Remove duplication with QCoreApplication::applicationIdJoão Abecasis2011-04-041-19/+5
| | * | | | | | | | Adding comments; variable scopingJoão Abecasis2011-04-041-22/+30
| | * | | | | | | | Don't pre-check if directory exists as it's unnecessaryJoão Abecasis2011-04-041-35/+0
| | * | | | | | | | QTemporaryFile: More dead code eliminationJoão Abecasis2011-04-041-84/+29
| | * | | | | | | | Removing dead code in QTemporaryFileJoão Abecasis2011-04-041-18/+4
| | * | | | | | | | Remove duplicate #includeJoão Abecasis2011-04-041-1/+0
| | * | | | | | | | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-011-2/+2
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-131-15/+10
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Remove a race condition in SIGCHLD handler.Thiago Macieira2011-04-131-15/+10
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-13/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-312-7/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | QDirIterator returns hidden directories when it should only return filesCarlos Manuel Duclos Vergara2011-03-301-13/+15
| * | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-0511-14/+93
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-053-0/+51
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add methods for traversing and combining QProcessEnvironment.Thomas Sondergaard2011-04-043-0/+51
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-7/+8
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Doc: Removed links to obsolete API in QResourceGeir Vattekar2011-03-171-3/+3
| | | * | | | | | | Doc: Clarified the -1 return value of QIODevice::readData().David Boddie2011-02-171-4/+5
| | | |/ / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-251-4/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | QDir: Fix absolute paths when using file enginesJoão Abecasis2011-03-181-4/+11
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-1615-14/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-095-10/+28
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't leave from QNotifyChangeEvent::RunL() in QFileSystemWatcherMiikka Heikkinen2011-03-041-1/+4
| * | | | | | | | | | Fix QProcess::waitForFinished WaitForRequest handling in SymbianMiikka Heikkinen2011-03-031-8/+7
| * | | | | | | | | | Added a note to docs about killing processes in Symbian.Miikka Heikkinen2011-03-031-0/+3
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-2518-17/+38
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix warning about "data" being unused.Thiago Macieira2011-03-221-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |