summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-211-53/+50
|\
| * QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| * If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| * QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
* | Merge branch '4.6'Thiago Macieira2010-01-182-2/+6
|\ \ | |/
| * QFile::remove: don't fail for unrelated errorsJoão Abecasis2010-01-141-0/+1
| * Remove erroneous warning in QFileInfo::absolutePath()Andreas Kling2010-01-131-2/+5
* | Merge branch '4.6'Thiago Macieira2010-01-1373-143/+267
|\ \ | |/
| * Add a way to access the normalised URL in QUrl.Thiago Macieira2010-01-111-4/+8
| * Avoid repeatedly calling LookupAccountSid in QFSFileEngine::ownerRitt Konstantin2010-01-071-10/+21
| * improve readability a bit moreRitt Konstantin2010-01-071-8/+8
| * fix styling; improve readabilityRitt Konstantin2010-01-071-36/+33
| * make it possible to retrieve name of the user who owns the fileRitt Konstantin2010-01-071-1/+2
| * Fix bugs evidenced by change to keep flush errors on QFile::closeJoão Abecasis2010-01-072-1/+4
| * Don't drop errors from flush on QFile::closeJoão Abecasis2010-01-071-3/+6
| * Avoid double-buffering in QFileJoão Abecasis2010-01-071-4/+3
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0773-90/+195
| |\
| | * Make an empty QUrl also be considered non-detached (d == 0).Thiago Macieira2010-01-071-1/+1
| | * Improve QUrl constructing performance by making empty URLs have d==0.Thiago Macieira2010-01-071-15/+119
| | * QIODevice: Fix readAll()Markus Goetz2010-01-061-2/+3
| | * Update copyright year to 2010Jason McDonald2010-01-0673-73/+73
| * | doc: Added enum values to table for Qt 4.5 and 4.6.Martin Smith2010-01-071-6/+8
| |/
* | add a hash function to QUrl, and remove the xmlpatterns specific onePeter Hartmann2010-01-131-0/+7
* | Merge branch '4.6'Thiago Macieira2010-01-082-5/+14
|\ \ | |/
| * doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
| * Small optimization in QIODevice::readAll()Markus Goetz2010-01-051-2/+10
| * Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
* | Merge branch '4.6'Thiago Macieira2010-01-053-14/+14
|\ \ | |/
| * QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-281-5/+9
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-262-9/+5
| |\
| | * revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845Ritt Konstantin2009-12-232-9/+5
* | | Merge branch '4.6'Thiago Macieira2009-12-264-7/+8
|\ \ \ | |/ /
| * | Fix warning on 64-bit build with MSVC.Thiago Macieira2009-12-251-1/+1
| |/
| * Warn when calling QFileInfo::absolutePath() on an improper object.Andreas Kling2009-12-211-0/+2
| * Fixed QResource to respect the explicitely set localeDenis Dzyubenko2009-12-171-1/+1
| * An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
* | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-8/+7
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+2
|\ \ | |/
| * Ensure that QProcessEnvironment::operator== doesn't crashThiago Macieira2009-12-101-1/+2
| * Use realpath() only on systems we know it works on.Denis Dzyubenko2009-12-091-1/+1
* | Re-enabled support for the FSEvents-based QFileSystemWatcher.Denis Dzyubenko2009-12-092-6/+6
* | Implemented getting a canonical file name on Mac OS X 10.5Denis Dzyubenko2009-12-091-1/+16
* | Use realpath only on OS we know it works on.Denis Dzyubenko2009-12-091-3/+9
* | Merge branch '4.6'Thiago Macieira2009-12-024-19/+42
|\ \ | |/
| * Fix regression in tst_QFileSystemWatcherBradley T. Hughes2009-12-011-7/+3
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-12-011-3/+4
| |\
| | * Re-enabled realpath() on symbian.Denis Dzyubenko2009-12-011-1/+1
| | * Fix a crash in QFSFileEnginePrivate::canonicalized() on Mac OS X 10.5Prasanth Ullattil2009-12-011-3/+4
| * | Make sure file descriptors are valid in the dnotify implementation of QFileSy...Bradley T. Hughes2009-12-011-2/+2
| |/
| * Fixes a crash on Mac with QFileInfo.Denis Dzyubenko2009-11-301-1/+5